diff --git a/COPYING b/COPYING
deleted file mode 100644
index 94a9ed02..00000000
--- a/COPYING
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/LICENSE-APACHE b/LICENSE-APACHE
new file mode 100644
index 00000000..d6456956
--- /dev/null
+++ b/LICENSE-APACHE
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/LICENSE-MIT b/LICENSE-MIT
new file mode 100644
index 00000000..80d95b9e
--- /dev/null
+++ b/LICENSE-MIT
@@ -0,0 +1,25 @@
+Copyright (c) 2016 The Tock Project Developers
+
+Permission is hereby granted, free of charge, to any
+person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the
+Software without restriction, including without
+limitation the rights to use, copy, modify, merge,
+publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice
+shall be included in all copies or substantial portions
+of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
+ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
+TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/README.md b/README.md
index db18f9f8..1f9b6be8 100644
--- a/README.md
+++ b/README.md
@@ -28,35 +28,30 @@ understand internal core design and higher-level MCU usage.
     Core selection is achieved using tup variants. By default, a pipelined
     version of every supported core is created, see the simulator/configs/
     directory for other options.
-    * _The simulator is licensed under the GPLv3_
 
   * The platforms directory contains additional support for the various cores.
     In particular, it contains software desgined to run on each of the unique
     cores supported by the simulator. In addition, the M3 platform contains some
     tools for programming M3 chips and in-circuit emulation.
-    * _The platforms are licensed under the MIT/XWin license_
 
   * The docs/ directories hold the course materials and some amount of dated
     information on the simulator design. It is not particularly useful currently
-    * _Documentation, course materials licensed under the MIT/Xwin license_
 
 ********************************************************************************
 
-## Known Issues
 
-  * There is little documentation currently available. Hopefully things are
-    mostly intuitive / have good error messages. Github issues are appreciated
-    if there are any particular pain points that need addressing.
-  * Interrupts may be unreliable -- the code path is not heavily tested, though
-    no known bugs currently exist.
-  * Course documentation is out of date, does not reflect current projects
-      - Or even all of the original projects for that matter
+License
+-------
 
-## Future Features / Goals
+Licensed under either of
 
-  * General clean-up of configuration options
-  * Larger / more interesting peripheral library
-  * Better gdb / recovery semantics
-      - This likely correlates with BusFault-style work
-      - This is why there is a temporary imbalance in memory semantics,
-        supporting the try_read_byte function for gdb
+- Apache License, Version 2.0 ([LICENSE-APACHE](LICENSE-APACHE) or
+  http://www.apache.org/licenses/LICENSE-2.0)
+- MIT license ([LICENSE-MIT](LICENSE-MIT) or
+  http://opensource.org/licenses/MIT)
+
+at your option.
+
+Unless you explicitly state otherwise, any contribution intentionally submitted
+for inclusion in the work by you, as defined in the Apache-2.0 license, shall
+be dual licensed as above, without any additional terms or conditions.
diff --git a/simulator/cli/cli.c b/simulator/cli/cli.c
index 2f520232..50b5ea1e 100644
--- a/simulator/cli/cli.c
+++ b/simulator/cli/cli.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/common.h"
diff --git a/simulator/core/atomic_support.h b/simulator/core/atomic_support.h
index b0656f71..4e7f2e31 100644
--- a/simulator/core/atomic_support.h
+++ b/simulator/core/atomic_support.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef ATOMIC_SUPPORT_H
diff --git a/simulator/core/common.h b/simulator/core/common.h
index bc531c86..9dd783de 100644
--- a/simulator/core/common.h
+++ b/simulator/core/common.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef COMMON_H
diff --git a/simulator/core/conf.c b/simulator/core/conf.c
index 1c4144a2..446f9e73 100644
--- a/simulator/core/conf.c
+++ b/simulator/core/conf.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 int CONF_no_terminate;
diff --git a/simulator/core/conf.h b/simulator/core/conf.h
index a3e52b64..72e6e286 100644
--- a/simulator/core/conf.h
+++ b/simulator/core/conf.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef CONF_H
diff --git a/simulator/core/ex_stage.c b/simulator/core/ex_stage.c
index 5d974f23..d8d2e14f 100644
--- a/simulator/core/ex_stage.c
+++ b/simulator/core/ex_stage.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #define STAGE EX
diff --git a/simulator/core/ex_stage.h b/simulator/core/ex_stage.h
index 488d4e49..c7ade493 100644
--- a/simulator/core/ex_stage.h
+++ b/simulator/core/ex_stage.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef EX_STAGE_H
diff --git a/simulator/core/gdb.c b/simulator/core/gdb.c
index 2e03921a..bd506498 100644
--- a/simulator/core/gdb.c
+++ b/simulator/core/gdb.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "gdb.h"
diff --git a/simulator/core/gdb.h b/simulator/core/gdb.h
index 5af75344..3650c854 100644
--- a/simulator/core/gdb.h
+++ b/simulator/core/gdb.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef GDB_H
diff --git a/simulator/core/id_stage.c b/simulator/core/id_stage.c
index 0103e482..a6db0488 100644
--- a/simulator/core/id_stage.c
+++ b/simulator/core/id_stage.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #define STAGE ID
diff --git a/simulator/core/id_stage.h b/simulator/core/id_stage.h
index fc24489e..5db37684 100644
--- a/simulator/core/id_stage.h
+++ b/simulator/core/id_stage.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef ID_STAGE_H
diff --git a/simulator/core/if_stage.c b/simulator/core/if_stage.c
index 58e9386e..a6e73043 100644
--- a/simulator/core/if_stage.c
+++ b/simulator/core/if_stage.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #define STAGE IF
diff --git a/simulator/core/if_stage.h b/simulator/core/if_stage.h
index 39266681..07ba6597 100644
--- a/simulator/core/if_stage.h
+++ b/simulator/core/if_stage.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef IF_STAGE_H
diff --git a/simulator/core/isa/arm-thumb/add.c b/simulator/core/isa/arm-thumb/add.c
index 26ce5b5c..833e7e4e 100644
--- a/simulator/core/isa/arm-thumb/add.c
+++ b/simulator/core/isa/arm-thumb/add.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-thumb/branch.c b/simulator/core/isa/arm-thumb/branch.c
index 42fd75ab..82362006 100644
--- a/simulator/core/isa/arm-thumb/branch.c
+++ b/simulator/core/isa/arm-thumb/branch.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-thumb/cmp.c b/simulator/core/isa/arm-thumb/cmp.c
index e2a8e773..bcab6dcc 100644
--- a/simulator/core/isa/arm-thumb/cmp.c
+++ b/simulator/core/isa/arm-thumb/cmp.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-thumb/extend.c b/simulator/core/isa/arm-thumb/extend.c
index 0adfb8e3..091b3b4c 100644
--- a/simulator/core/isa/arm-thumb/extend.c
+++ b/simulator/core/isa/arm-thumb/extend.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-thumb/hints.c b/simulator/core/isa/arm-thumb/hints.c
index 9c3d1d67..388b3138 100644
--- a/simulator/core/isa/arm-thumb/hints.c
+++ b/simulator/core/isa/arm-thumb/hints.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-thumb/ldm.c b/simulator/core/isa/arm-thumb/ldm.c
index 0abd7aa0..248d51cf 100644
--- a/simulator/core/isa/arm-thumb/ldm.c
+++ b/simulator/core/isa/arm-thumb/ldm.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-thumb/ldr.c b/simulator/core/isa/arm-thumb/ldr.c
index 52fce9e6..af069eb1 100644
--- a/simulator/core/isa/arm-thumb/ldr.c
+++ b/simulator/core/isa/arm-thumb/ldr.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-thumb/logical.c b/simulator/core/isa/arm-thumb/logical.c
index 1d800cd2..6e590e82 100644
--- a/simulator/core/isa/arm-thumb/logical.c
+++ b/simulator/core/isa/arm-thumb/logical.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-thumb/misc.c b/simulator/core/isa/arm-thumb/misc.c
index 7a741514..a927f8c5 100644
--- a/simulator/core/isa/arm-thumb/misc.c
+++ b/simulator/core/isa/arm-thumb/misc.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-thumb/mov.c b/simulator/core/isa/arm-thumb/mov.c
index 890571d5..42a9c391 100644
--- a/simulator/core/isa/arm-thumb/mov.c
+++ b/simulator/core/isa/arm-thumb/mov.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-thumb/mul.c b/simulator/core/isa/arm-thumb/mul.c
index 3a2cb0b7..7e46de01 100644
--- a/simulator/core/isa/arm-thumb/mul.c
+++ b/simulator/core/isa/arm-thumb/mul.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-thumb/pop.c b/simulator/core/isa/arm-thumb/pop.c
index d262ef37..e06f0d1f 100644
--- a/simulator/core/isa/arm-thumb/pop.c
+++ b/simulator/core/isa/arm-thumb/pop.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-thumb/push.c b/simulator/core/isa/arm-thumb/push.c
index 91f4332e..fdb41bfd 100644
--- a/simulator/core/isa/arm-thumb/push.c
+++ b/simulator/core/isa/arm-thumb/push.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-thumb/shift.c b/simulator/core/isa/arm-thumb/shift.c
index 751ed410..7a3dce95 100644
--- a/simulator/core/isa/arm-thumb/shift.c
+++ b/simulator/core/isa/arm-thumb/shift.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-thumb/status.c b/simulator/core/isa/arm-thumb/status.c
index a5af0158..44586ea1 100644
--- a/simulator/core/isa/arm-thumb/status.c
+++ b/simulator/core/isa/arm-thumb/status.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-thumb/str.c b/simulator/core/isa/arm-thumb/str.c
index 363bc3e4..5fe5d22c 100644
--- a/simulator/core/isa/arm-thumb/str.c
+++ b/simulator/core/isa/arm-thumb/str.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-thumb/strm.c b/simulator/core/isa/arm-thumb/strm.c
index de16379c..0143eb59 100644
--- a/simulator/core/isa/arm-thumb/strm.c
+++ b/simulator/core/isa/arm-thumb/strm.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-thumb/sub.c b/simulator/core/isa/arm-thumb/sub.c
index 3dbe448f..e1dac8b4 100644
--- a/simulator/core/isa/arm-thumb/sub.c
+++ b/simulator/core/isa/arm-thumb/sub.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v6-m/mov.c b/simulator/core/isa/arm-v6-m/mov.c
index d4e87419..5f2b3187 100644
--- a/simulator/core/isa/arm-v6-m/mov.c
+++ b/simulator/core/isa/arm-v6-m/mov.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2017  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/add.c b/simulator/core/isa/arm-v7-m/add.c
index 928c2417..4f85632b 100644
--- a/simulator/core/isa/arm-v7-m/add.c
+++ b/simulator/core/isa/arm-v7-m/add.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/branch.c b/simulator/core/isa/arm-v7-m/branch.c
index 517c991a..aa5c1b19 100644
--- a/simulator/core/isa/arm-v7-m/branch.c
+++ b/simulator/core/isa/arm-v7-m/branch.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/cb.c b/simulator/core/isa/arm-v7-m/cb.c
index 4285f037..44e42b68 100644
--- a/simulator/core/isa/arm-v7-m/cb.c
+++ b/simulator/core/isa/arm-v7-m/cb.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/cmp.c b/simulator/core/isa/arm-v7-m/cmp.c
index ae6b8fd9..bdadd06a 100644
--- a/simulator/core/isa/arm-v7-m/cmp.c
+++ b/simulator/core/isa/arm-v7-m/cmp.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/div.c b/simulator/core/isa/arm-v7-m/div.c
index 50ecccb6..4dfe1d27 100644
--- a/simulator/core/isa/arm-v7-m/div.c
+++ b/simulator/core/isa/arm-v7-m/div.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/extend.c b/simulator/core/isa/arm-v7-m/extend.c
index d2331fc2..ed4227cf 100644
--- a/simulator/core/isa/arm-v7-m/extend.c
+++ b/simulator/core/isa/arm-v7-m/extend.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/hints.c b/simulator/core/isa/arm-v7-m/hints.c
index d99c7908..609794fd 100644
--- a/simulator/core/isa/arm-v7-m/hints.c
+++ b/simulator/core/isa/arm-v7-m/hints.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/it.c b/simulator/core/isa/arm-v7-m/it.c
index c49a0755..f2aec3f8 100644
--- a/simulator/core/isa/arm-v7-m/it.c
+++ b/simulator/core/isa/arm-v7-m/it.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/ldm.c b/simulator/core/isa/arm-v7-m/ldm.c
index 5e9ffb29..7faf1414 100644
--- a/simulator/core/isa/arm-v7-m/ldm.c
+++ b/simulator/core/isa/arm-v7-m/ldm.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/ldr.c b/simulator/core/isa/arm-v7-m/ldr.c
index 3a671400..2a8d8493 100644
--- a/simulator/core/isa/arm-v7-m/ldr.c
+++ b/simulator/core/isa/arm-v7-m/ldr.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/logical.c b/simulator/core/isa/arm-v7-m/logical.c
index 53b3e64b..2de1f080 100644
--- a/simulator/core/isa/arm-v7-m/logical.c
+++ b/simulator/core/isa/arm-v7-m/logical.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/misc.c b/simulator/core/isa/arm-v7-m/misc.c
index 3ad5afdc..009610f7 100644
--- a/simulator/core/isa/arm-v7-m/misc.c
+++ b/simulator/core/isa/arm-v7-m/misc.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/mov.c b/simulator/core/isa/arm-v7-m/mov.c
index b95b1c83..22e8ba8d 100644
--- a/simulator/core/isa/arm-v7-m/mov.c
+++ b/simulator/core/isa/arm-v7-m/mov.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/mul.c b/simulator/core/isa/arm-v7-m/mul.c
index aaf928c2..26dedd9e 100644
--- a/simulator/core/isa/arm-v7-m/mul.c
+++ b/simulator/core/isa/arm-v7-m/mul.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/pop.c b/simulator/core/isa/arm-v7-m/pop.c
index 76795779..9d8ea041 100644
--- a/simulator/core/isa/arm-v7-m/pop.c
+++ b/simulator/core/isa/arm-v7-m/pop.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/push.c b/simulator/core/isa/arm-v7-m/push.c
index d711cbcb..b6767aff 100644
--- a/simulator/core/isa/arm-v7-m/push.c
+++ b/simulator/core/isa/arm-v7-m/push.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/sat.c b/simulator/core/isa/arm-v7-m/sat.c
index 6fecc6fd..d67876b5 100644
--- a/simulator/core/isa/arm-v7-m/sat.c
+++ b/simulator/core/isa/arm-v7-m/sat.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/shift.c b/simulator/core/isa/arm-v7-m/shift.c
index 4de1267c..902401a5 100644
--- a/simulator/core/isa/arm-v7-m/shift.c
+++ b/simulator/core/isa/arm-v7-m/shift.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/str.c b/simulator/core/isa/arm-v7-m/str.c
index e8c58551..8b9bc900 100644
--- a/simulator/core/isa/arm-v7-m/str.c
+++ b/simulator/core/isa/arm-v7-m/str.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/strm.c b/simulator/core/isa/arm-v7-m/strm.c
index 89ac9aec..538dbdd6 100644
--- a/simulator/core/isa/arm-v7-m/strm.c
+++ b/simulator/core/isa/arm-v7-m/strm.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm-v7-m/sub.c b/simulator/core/isa/arm-v7-m/sub.c
index 525ce4dd..72a8d1da 100644
--- a/simulator/core/isa/arm-v7-m/sub.c
+++ b/simulator/core/isa/arm-v7-m/sub.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/isa/opcodes.h"
diff --git a/simulator/core/isa/arm_types.h b/simulator/core/isa/arm_types.h
index 696448ec..fd2ae95b 100644
--- a/simulator/core/isa/arm_types.h
+++ b/simulator/core/isa/arm_types.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef __ARM_TYPES_H
diff --git a/simulator/core/isa/decode_helpers.c b/simulator/core/isa/decode_helpers.c
index c8b6b5b1..c2b9d037 100644
--- a/simulator/core/isa/decode_helpers.c
+++ b/simulator/core/isa/decode_helpers.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "decode_helpers.h"
diff --git a/simulator/core/isa/decode_helpers.h b/simulator/core/isa/decode_helpers.h
index 94c0942b..13f370b0 100644
--- a/simulator/core/isa/decode_helpers.h
+++ b/simulator/core/isa/decode_helpers.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef __DECODE_HELPERS_H
diff --git a/simulator/core/isa/decompile.c b/simulator/core/isa/decompile.c
index a253202a..974aca1a 100644
--- a/simulator/core/isa/decompile.c
+++ b/simulator/core/isa/decompile.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/common.h"
diff --git a/simulator/core/isa/opcodes.h b/simulator/core/isa/opcodes.h
index daa054e7..df1e1631 100644
--- a/simulator/core/isa/opcodes.h
+++ b/simulator/core/isa/opcodes.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef OPCODES_H
diff --git a/simulator/core/loader.c b/simulator/core/loader.c
index b5cd546f..091762f9 100644
--- a/simulator/core/loader.c
+++ b/simulator/core/loader.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include <sys/stat.h>
diff --git a/simulator/core/loader.h b/simulator/core/loader.h
index 368c1e21..5d87f8bb 100644
--- a/simulator/core/loader.h
+++ b/simulator/core/loader.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef LOADER_H
diff --git a/simulator/core/opcodes.c b/simulator/core/opcodes.c
index bcf7029b..f9d3ce85 100644
--- a/simulator/core/opcodes.c
+++ b/simulator/core/opcodes.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2013  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "opcodes.h"
diff --git a/simulator/core/opcodes.h b/simulator/core/opcodes.h
index 65e104aa..c2285002 100644
--- a/simulator/core/opcodes.h
+++ b/simulator/core/opcodes.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef OPCODES_H
diff --git a/simulator/core/operations/add.c b/simulator/core/operations/add.c
index db20d051..965504df 100644
--- a/simulator/core/operations/add.c
+++ b/simulator/core/operations/add.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "helpers.h"
diff --git a/simulator/core/operations/add.h b/simulator/core/operations/add.h
index 9208bb68..516754ed 100644
--- a/simulator/core/operations/add.h
+++ b/simulator/core/operations/add.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void adc_imm(uint8_t rd, uint8_t rn, uint32_t imm32, bool setflags);
diff --git a/simulator/core/operations/branch.c b/simulator/core/operations/branch.c
index 8b32d79a..301e6b76 100644
--- a/simulator/core/operations/branch.c
+++ b/simulator/core/operations/branch.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "helpers.h"
diff --git a/simulator/core/operations/branch.h b/simulator/core/operations/branch.h
index 4985255e..13ae95c4 100644
--- a/simulator/core/operations/branch.h
+++ b/simulator/core/operations/branch.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void b(uint8_t cond, uint32_t imm32);
diff --git a/simulator/core/operations/cb.c b/simulator/core/operations/cb.c
index 7dc52694..87c9b2e6 100644
--- a/simulator/core/operations/cb.c
+++ b/simulator/core/operations/cb.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "helpers.h"
diff --git a/simulator/core/operations/cb.h b/simulator/core/operations/cb.h
index 2e0006c0..d6285d21 100644
--- a/simulator/core/operations/cb.h
+++ b/simulator/core/operations/cb.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void cbz(bool nonzero, uint8_t rn, uint32_t imm32);
diff --git a/simulator/core/operations/cmp.c b/simulator/core/operations/cmp.c
index f5f71fe8..f40e34a0 100644
--- a/simulator/core/operations/cmp.c
+++ b/simulator/core/operations/cmp.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "helpers.h"
diff --git a/simulator/core/operations/cmp.h b/simulator/core/operations/cmp.h
index 090debc2..9666a846 100644
--- a/simulator/core/operations/cmp.h
+++ b/simulator/core/operations/cmp.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void cmn_imm(uint8_t rn, uint32_t imm32);
diff --git a/simulator/core/operations/div.c b/simulator/core/operations/div.c
index bad0f55d..858ff9aa 100644
--- a/simulator/core/operations/div.c
+++ b/simulator/core/operations/div.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "helpers.h"
diff --git a/simulator/core/operations/div.h b/simulator/core/operations/div.h
index 162b8ab2..ccb2e323 100644
--- a/simulator/core/operations/div.h
+++ b/simulator/core/operations/div.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void sdiv(uint8_t rd, uint8_t rn, uint8_t rm);
diff --git a/simulator/core/operations/extend.c b/simulator/core/operations/extend.c
index 988941d5..7cd81035 100644
--- a/simulator/core/operations/extend.c
+++ b/simulator/core/operations/extend.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "helpers.h"
diff --git a/simulator/core/operations/extend.h b/simulator/core/operations/extend.h
index 1fb4c1c1..ba895b9e 100644
--- a/simulator/core/operations/extend.h
+++ b/simulator/core/operations/extend.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void sxtb(uint8_t rd, uint8_t rm, uint8_t rotation);
diff --git a/simulator/core/operations/helpers.c b/simulator/core/operations/helpers.c
index 7c69f667..65170ccd 100644
--- a/simulator/core/operations/helpers.c
+++ b/simulator/core/operations/helpers.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "helpers.h"
diff --git a/simulator/core/operations/helpers.h b/simulator/core/operations/helpers.h
index fd0d0986..fbbc6c34 100644
--- a/simulator/core/operations/helpers.h
+++ b/simulator/core/operations/helpers.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef __HELPERS_H
diff --git a/simulator/core/operations/hints.c b/simulator/core/operations/hints.c
index 3c73c4d7..05cc74f6 100644
--- a/simulator/core/operations/hints.c
+++ b/simulator/core/operations/hints.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core/state_sync.h"
diff --git a/simulator/core/operations/hints.h b/simulator/core/operations/hints.h
index 1fecb315..17d06aa6 100644
--- a/simulator/core/operations/hints.h
+++ b/simulator/core/operations/hints.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void dbg(uint8_t option __attribute__ ((unused)));
diff --git a/simulator/core/operations/it.c b/simulator/core/operations/it.c
index aed4006f..19832250 100644
--- a/simulator/core/operations/it.c
+++ b/simulator/core/operations/it.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "cpu/misc.h"
diff --git a/simulator/core/operations/it.h b/simulator/core/operations/it.h
index b221a4a7..3fb84cce 100644
--- a/simulator/core/operations/it.h
+++ b/simulator/core/operations/it.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void it(uint8_t itstate);
diff --git a/simulator/core/operations/ldm.c b/simulator/core/operations/ldm.c
index 154922c1..ada8625c 100644
--- a/simulator/core/operations/ldm.c
+++ b/simulator/core/operations/ldm.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "helpers.h"
diff --git a/simulator/core/operations/ldm.h b/simulator/core/operations/ldm.h
index 8cf61609..0dcb80c1 100644
--- a/simulator/core/operations/ldm.h
+++ b/simulator/core/operations/ldm.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void ldm(uint8_t rn, uint16_t registers, bool wback);
diff --git a/simulator/core/operations/ldr.c b/simulator/core/operations/ldr.c
index 00e304c7..09bf5d5b 100644
--- a/simulator/core/operations/ldr.c
+++ b/simulator/core/operations/ldr.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "helpers.h"
diff --git a/simulator/core/operations/ldr.h b/simulator/core/operations/ldr.h
index 77305e97..d27f9c36 100644
--- a/simulator/core/operations/ldr.h
+++ b/simulator/core/operations/ldr.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void ldr_imm(uint8_t rt, uint8_t rn, uint32_t imm32, bool index, bool add, bool wback);
diff --git a/simulator/core/operations/logical.c b/simulator/core/operations/logical.c
index 29baca4f..8d55a06e 100644
--- a/simulator/core/operations/logical.c
+++ b/simulator/core/operations/logical.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "helpers.h"
diff --git a/simulator/core/operations/logical.h b/simulator/core/operations/logical.h
index 95373d18..a8e8c257 100644
--- a/simulator/core/operations/logical.h
+++ b/simulator/core/operations/logical.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void and_imm(union apsr_t apsr, uint8_t setflags, uint8_t rd, uint8_t rn,
diff --git a/simulator/core/operations/misc.c b/simulator/core/operations/misc.c
index 361f5bfe..41f25590 100644
--- a/simulator/core/operations/misc.c
+++ b/simulator/core/operations/misc.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2013  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "helpers.h"
diff --git a/simulator/core/operations/misc.h b/simulator/core/operations/misc.h
index 776dd366..4e548888 100644
--- a/simulator/core/operations/misc.h
+++ b/simulator/core/operations/misc.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void bfc(uint8_t rd, uint8_t msbit, uint8_t lsbit);
diff --git a/simulator/core/operations/mov.c b/simulator/core/operations/mov.c
index 09661344..80aef58b 100644
--- a/simulator/core/operations/mov.c
+++ b/simulator/core/operations/mov.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "helpers.h"
diff --git a/simulator/core/operations/mov.h b/simulator/core/operations/mov.h
index 24d2fbc8..9ccdeb05 100644
--- a/simulator/core/operations/mov.h
+++ b/simulator/core/operations/mov.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void mov_imm(union apsr_t apsr, uint8_t setflags, uint32_t imm32, uint8_t rd, uint8_t carry);
diff --git a/simulator/core/operations/mul.c b/simulator/core/operations/mul.c
index bb562cf9..89f73450 100644
--- a/simulator/core/operations/mul.c
+++ b/simulator/core/operations/mul.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "helpers.h"
diff --git a/simulator/core/operations/mul.h b/simulator/core/operations/mul.h
index 1abc2f9e..dff26b65 100644
--- a/simulator/core/operations/mul.h
+++ b/simulator/core/operations/mul.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void mla(uint8_t rd, uint8_t rn, uint8_t rm, uint8_t ra);
diff --git a/simulator/core/operations/pop.c b/simulator/core/operations/pop.c
index b8f52c24..08a8ab95 100644
--- a/simulator/core/operations/pop.c
+++ b/simulator/core/operations/pop.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "helpers.h"
diff --git a/simulator/core/operations/pop.h b/simulator/core/operations/pop.h
index 818166e3..00925f60 100644
--- a/simulator/core/operations/pop.h
+++ b/simulator/core/operations/pop.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void pop(uint16_t registers);
diff --git a/simulator/core/operations/push.c b/simulator/core/operations/push.c
index 5225d7fc..e3060912 100644
--- a/simulator/core/operations/push.c
+++ b/simulator/core/operations/push.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "helpers.h"
diff --git a/simulator/core/operations/push.h b/simulator/core/operations/push.h
index 97328e9d..6a0c72e1 100644
--- a/simulator/core/operations/push.h
+++ b/simulator/core/operations/push.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void push(const uint16_t registers);
diff --git a/simulator/core/operations/sat.c b/simulator/core/operations/sat.c
index bce0046c..4556ed24 100644
--- a/simulator/core/operations/sat.c
+++ b/simulator/core/operations/sat.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "helpers.h"
diff --git a/simulator/core/operations/sat.h b/simulator/core/operations/sat.h
index 668d0860..88faf38e 100644
--- a/simulator/core/operations/sat.h
+++ b/simulator/core/operations/sat.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void ssat(uint8_t rd, uint8_t rn, uint8_t saturate_to,
diff --git a/simulator/core/operations/shift.c b/simulator/core/operations/shift.c
index aca82efb..e4c5051a 100644
--- a/simulator/core/operations/shift.c
+++ b/simulator/core/operations/shift.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2013  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 // XXX: Workaround for unified shift decoders
diff --git a/simulator/core/operations/shift.h b/simulator/core/operations/shift.h
index 9c62c6f0..2f357bfc 100644
--- a/simulator/core/operations/shift.h
+++ b/simulator/core/operations/shift.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void shift_imm(union apsr_t apsr, uint8_t setflags, uint8_t rd, uint8_t rm,
diff --git a/simulator/core/operations/status.c b/simulator/core/operations/status.c
index 35d00d52..cecd63ce 100644
--- a/simulator/core/operations/status.c
+++ b/simulator/core/operations/status.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2013  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 // A4.5 Status register access instructions
diff --git a/simulator/core/operations/status.h b/simulator/core/operations/status.h
index 696dc0fc..66782736 100644
--- a/simulator/core/operations/status.h
+++ b/simulator/core/operations/status.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void cps(bool enable, bool disable, bool affectPri, bool affectFault);
diff --git a/simulator/core/operations/str.c b/simulator/core/operations/str.c
index 4b7447ff..8c5ffc5c 100644
--- a/simulator/core/operations/str.c
+++ b/simulator/core/operations/str.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "helpers.h"
diff --git a/simulator/core/operations/str.h b/simulator/core/operations/str.h
index 44d95689..90ba454e 100644
--- a/simulator/core/operations/str.h
+++ b/simulator/core/operations/str.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void str_imm(uint8_t rt, uint8_t rn, uint32_t imm32,
diff --git a/simulator/core/operations/strm.c b/simulator/core/operations/strm.c
index a18df582..43b6e04d 100644
--- a/simulator/core/operations/strm.c
+++ b/simulator/core/operations/strm.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "helpers.h"
diff --git a/simulator/core/operations/strm.h b/simulator/core/operations/strm.h
index ecf7d325..797ffa8c 100644
--- a/simulator/core/operations/strm.h
+++ b/simulator/core/operations/strm.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void stmdb(uint8_t rn, uint16_t registers, bool wback);
diff --git a/simulator/core/operations/sub.c b/simulator/core/operations/sub.c
index b3b30542..4a344afc 100644
--- a/simulator/core/operations/sub.c
+++ b/simulator/core/operations/sub.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "helpers.h"
diff --git a/simulator/core/operations/sub.h b/simulator/core/operations/sub.h
index 08de777f..7a16403c 100644
--- a/simulator/core/operations/sub.h
+++ b/simulator/core/operations/sub.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 void rsb_imm(uint8_t rd, uint8_t rn, uint32_t imm32, bool setflags);
diff --git a/simulator/core/pipeline.c b/simulator/core/pipeline.c
index f1c5a3f7..603095f0 100644
--- a/simulator/core/pipeline.c
+++ b/simulator/core/pipeline.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #define STAGE PIPE
diff --git a/simulator/core/pipeline.h b/simulator/core/pipeline.h
index 144683ce..220c1659 100644
--- a/simulator/core/pipeline.h
+++ b/simulator/core/pipeline.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef PIPELINE_H
diff --git a/simulator/core/pretty_print.h b/simulator/core/pretty_print.h
index e41ed6b9..95a5fd93 100644
--- a/simulator/core/pretty_print.h
+++ b/simulator/core/pretty_print.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef PRETTY_PRINT_H
diff --git a/simulator/core/simulator.c b/simulator/core/simulator.c
index 95590a27..e065e78f 100644
--- a/simulator/core/simulator.c
+++ b/simulator/core/simulator.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #define STAGE SIM
diff --git a/simulator/core/simulator.h b/simulator/core/simulator.h
index deb8bb5f..cec0620f 100644
--- a/simulator/core/simulator.h
+++ b/simulator/core/simulator.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef SIMULATOR_H
diff --git a/simulator/core/state.c b/simulator/core/state.c
index 959f568d..9036bf3d 100644
--- a/simulator/core/state.c
+++ b/simulator/core/state.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #define DIRECT_STATE_H_CHECK
diff --git a/simulator/core/state.h b/simulator/core/state.h
index 7e4cee91..a274f3de 100644
--- a/simulator/core/state.h
+++ b/simulator/core/state.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef DIRECT_STATE_H_CHECK
diff --git a/simulator/core/state_async.h b/simulator/core/state_async.h
index e2de5edd..64188b4e 100644
--- a/simulator/core/state_async.h
+++ b/simulator/core/state_async.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef STATE_ASYNC_H
diff --git a/simulator/core/state_sync.h b/simulator/core/state_sync.h
index 657f2f7f..28b9f928 100644
--- a/simulator/core/state_sync.h
+++ b/simulator/core/state_sync.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef STATE_SYNC_H
diff --git a/simulator/cpu/373/leds.c b/simulator/cpu/373/leds.c
index d27ba48d..be6e6ac0 100644
--- a/simulator/cpu/373/leds.c
+++ b/simulator/cpu/373/leds.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "leds.h"
diff --git a/simulator/cpu/373/leds.h b/simulator/cpu/373/leds.h
index a938993d..cf9c3b98 100644
--- a/simulator/cpu/373/leds.h
+++ b/simulator/cpu/373/leds.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef LED_H
diff --git a/simulator/cpu/373/memmap.h b/simulator/cpu/373/memmap.h
index bf5e0754..17a79c53 100644
--- a/simulator/cpu/373/memmap.h
+++ b/simulator/cpu/373/memmap.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef MEMMAP_H
diff --git a/simulator/cpu/373/pins.h b/simulator/cpu/373/pins.h
index ca4bccd1..1f1b31f1 100644
--- a/simulator/cpu/373/pins.h
+++ b/simulator/cpu/373/pins.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef PINS_H
diff --git a/simulator/cpu/373/static_rom.c b/simulator/cpu/373/static_rom.c
index 2d5a39be..d5cef222 100644
--- a/simulator/cpu/373/static_rom.c
+++ b/simulator/cpu/373/static_rom.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2013  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 // bintoarray.sh; "echo.bin"
diff --git a/simulator/cpu/373/static_rom.h b/simulator/cpu/373/static_rom.h
index 56766e8b..97b5770a 100644
--- a/simulator/cpu/373/static_rom.h
+++ b/simulator/cpu/373/static_rom.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2013  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef STATIC_ROM_H
diff --git a/simulator/cpu/373/uart.c b/simulator/cpu/373/uart.c
index 11fd6d9e..d54fbe0e 100644
--- a/simulator/cpu/373/uart.c
+++ b/simulator/cpu/373/uart.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include <sys/stat.h>
diff --git a/simulator/cpu/373/uart.h b/simulator/cpu/373/uart.h
index ba350c51..7f457723 100644
--- a/simulator/cpu/373/uart.h
+++ b/simulator/cpu/373/uart.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef UART_H
diff --git a/simulator/cpu/common/gpio.c b/simulator/cpu/common/gpio.c
index 9cccc0bb..d1e9b092 100644
--- a/simulator/cpu/common/gpio.c
+++ b/simulator/cpu/common/gpio.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include <sys/select.h>
diff --git a/simulator/cpu/common/gpio.h b/simulator/cpu/common/gpio.h
index 7b1c755e..a98e56cd 100644
--- a/simulator/cpu/common/gpio.h
+++ b/simulator/cpu/common/gpio.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 /***
diff --git a/simulator/cpu/common/private_peripheral_bus/core_debug.conf b/simulator/cpu/common/private_peripheral_bus/core_debug.conf
index 1d279613..1431afae 100644
--- a/simulator/cpu/common/private_peripheral_bus/core_debug.conf
+++ b/simulator/cpu/common/private_peripheral_bus/core_debug.conf
@@ -1,20 +1,8 @@
-# Mulator - An extensible {ARM} {e,si}mulator
-# Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+# Mulator - An extensible {e,si}mulator
+# Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
 #
-# This file is part of Mulator.
-#
-# Mulator is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Mulator is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+# Licensed under either of the Apache License, Version 2.0
+# or the MIT license, at your option.
 
 
 # TRM, p77, 3.1.2 Core debug registers
diff --git a/simulator/cpu/common/private_peripheral_bus/embedded_trace_macrocell.conf b/simulator/cpu/common/private_peripheral_bus/embedded_trace_macrocell.conf
index 00c329ee..924e333c 100644
--- a/simulator/cpu/common/private_peripheral_bus/embedded_trace_macrocell.conf
+++ b/simulator/cpu/common/private_peripheral_bus/embedded_trace_macrocell.conf
@@ -1,21 +1,8 @@
-# Mulator - An extensible {ARM} {e,si}mulator
-# Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+# Mulator - An extensible {e,si}mulator
+# Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
 #
-# This file is part of Mulator.
-#
-# Mulator is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Mulator is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
-# TRM, p85, 3.1.7 Embedded Trace Macrocell registers
+# Licensed under either of the Apache License, Version 2.0
+# or the MIT license, at your option.
 
 
 #
diff --git a/simulator/cpu/common/private_peripheral_bus/gen_registers.py b/simulator/cpu/common/private_peripheral_bus/gen_registers.py
index 0810a433..86eead83 100755
--- a/simulator/cpu/common/private_peripheral_bus/gen_registers.py
+++ b/simulator/cpu/common/private_peripheral_bus/gen_registers.py
@@ -1,22 +1,10 @@
 #!/usr/bin/env python
 
-# Mulator - An extensible {ARM} {e,si}mulator
-# Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+# Mulator - An extensible {e,si}mulator
+# Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
 #
-# This file is part of Mulator.
-#
-# Mulator is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Mulator is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+# Licensed under either of the Apache License, Version 2.0
+# or the MIT license, at your option.
 
 import os
 import sys
diff --git a/simulator/cpu/common/private_peripheral_bus/mpu.conf b/simulator/cpu/common/private_peripheral_bus/mpu.conf
index 516800a9..4ff38eae 100644
--- a/simulator/cpu/common/private_peripheral_bus/mpu.conf
+++ b/simulator/cpu/common/private_peripheral_bus/mpu.conf
@@ -1,20 +1,9 @@
-# Mulator - An extensible {ARM} {e,si}mulator
-# Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+# Mulator - An extensible {e,si}mulator
+# Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
 #
-# This file is part of Mulator.
-#
-# Mulator is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Mulator is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+# Licensed under either of the Apache License, Version 2.0
+# or the MIT license, at your option.
+
 # TRM, p85, 3.1.7 Embedded Trace Macrocell registers
 
 
diff --git a/simulator/cpu/common/private_peripheral_bus/nvic.conf b/simulator/cpu/common/private_peripheral_bus/nvic.conf
index 729115bd..c0b28c60 100644
--- a/simulator/cpu/common/private_peripheral_bus/nvic.conf
+++ b/simulator/cpu/common/private_peripheral_bus/nvic.conf
@@ -1,21 +1,8 @@
-# Mulator - An extensible {ARM} {e,si}mulator
-# Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+# Mulator - An extensible {e,si}mulator
+# Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
 #
-# This file is part of Mulator.
-#
-# Mulator is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Mulator is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
-# TRM, p85, 3.1.7 Embedded Trace Macrocell registers
+# Licensed under either of the Apache License, Version 2.0
+# or the MIT license, at your option.
 
 
 # TRM, p74, 3.1.1
diff --git a/simulator/cpu/common/private_peripheral_bus/system_debug.conf b/simulator/cpu/common/private_peripheral_bus/system_debug.conf
index 2ad40fe0..6d5df708 100644
--- a/simulator/cpu/common/private_peripheral_bus/system_debug.conf
+++ b/simulator/cpu/common/private_peripheral_bus/system_debug.conf
@@ -1,20 +1,9 @@
-# Mulator - An extensible {ARM} {e,si}mulator
-# Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+# Mulator - An extensible {e,si}mulator
+# Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
 #
-# This file is part of Mulator.
-#
-# Mulator is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Mulator is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+# Licensed under either of the Apache License, Version 2.0
+# or the MIT license, at your option.
+
 # TRM, p85, 3.1.7 Embedded Trace Macrocell registers
 
 
diff --git a/simulator/cpu/common/private_peripheral_bus/trace_port.conf b/simulator/cpu/common/private_peripheral_bus/trace_port.conf
index b336705f..b83f8920 100644
--- a/simulator/cpu/common/private_peripheral_bus/trace_port.conf
+++ b/simulator/cpu/common/private_peripheral_bus/trace_port.conf
@@ -1,20 +1,9 @@
-# Mulator - An extensible {ARM} {e,si}mulator
-# Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+# Mulator - An extensible {e,si}mulator
+# Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
 #
-# This file is part of Mulator.
-#
-# Mulator is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Mulator is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+# Licensed under either of the Apache License, Version 2.0
+# or the MIT license, at your option.
+
 # TRM, p85, 3.1.7 Embedded Trace Macrocell registers
 
 
diff --git a/simulator/cpu/common/ram.c b/simulator/cpu/common/ram.c
index 98a70178..5bd48ed7 100644
--- a/simulator/cpu/common/ram.c
+++ b/simulator/cpu/common/ram.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include MEMMAP_HEADER
diff --git a/simulator/cpu/common/ram.h b/simulator/cpu/common/ram.h
index 9aaca97b..c65ffad0 100644
--- a/simulator/cpu/common/ram.h
+++ b/simulator/cpu/common/ram.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef RAM_H
diff --git a/simulator/cpu/common/rom.c b/simulator/cpu/common/rom.c
index 98043e3f..80303277 100644
--- a/simulator/cpu/common/rom.c
+++ b/simulator/cpu/common/rom.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include MEMMAP_HEADER
diff --git a/simulator/cpu/common/rom.h b/simulator/cpu/common/rom.h
index 6a28deae..8ad19105 100644
--- a/simulator/cpu/common/rom.h
+++ b/simulator/cpu/common/rom.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef ROM_H
diff --git a/simulator/cpu/core.c b/simulator/cpu/core.c
index a90efff2..aa1fb81b 100644
--- a/simulator/cpu/core.c
+++ b/simulator/cpu/core.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "core.h"
diff --git a/simulator/cpu/core.h b/simulator/cpu/core.h
index b50661a9..a8391aba 100644
--- a/simulator/cpu/core.h
+++ b/simulator/cpu/core.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef CORE_H
diff --git a/simulator/cpu/exception.c b/simulator/cpu/exception.c
index b37e7d57..84f3313e 100644
--- a/simulator/cpu/exception.c
+++ b/simulator/cpu/exception.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "exception.h"
diff --git a/simulator/cpu/exception.h b/simulator/cpu/exception.h
index 3ce3cc42..9729e694 100644
--- a/simulator/cpu/exception.h
+++ b/simulator/cpu/exception.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef EXCEPTION_H
diff --git a/simulator/cpu/features.h b/simulator/cpu/features.h
index 5ae3ee92..320ef350 100644
--- a/simulator/cpu/features.h
+++ b/simulator/cpu/features.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef FEATURES_H
diff --git a/simulator/cpu/m3_ctl_v3/i2c.c b/simulator/cpu/m3_ctl_v3/i2c.c
index b30d3afc..bbb60b43 100644
--- a/simulator/cpu/m3_ctl_v3/i2c.c
+++ b/simulator/cpu/m3_ctl_v3/i2c.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include <arpa/inet.h>
diff --git a/simulator/cpu/m3_ctl_v3/i2c.h b/simulator/cpu/m3_ctl_v3/i2c.h
index 1f676c26..82e65748 100644
--- a/simulator/cpu/m3_ctl_v3/i2c.h
+++ b/simulator/cpu/m3_ctl_v3/i2c.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef I2C_H
diff --git a/simulator/cpu/m3_ctl_v3/ice_bridge.c b/simulator/cpu/m3_ctl_v3/ice_bridge.c
index ee0a61d7..9dbac021 100644
--- a/simulator/cpu/m3_ctl_v3/ice_bridge.c
+++ b/simulator/cpu/m3_ctl_v3/ice_bridge.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2013  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifdef __APPLE__
diff --git a/simulator/cpu/m3_ctl_v3/ice_bridge.h b/simulator/cpu/m3_ctl_v3/ice_bridge.h
index 5864b685..ffa2123f 100644
--- a/simulator/cpu/m3_ctl_v3/ice_bridge.h
+++ b/simulator/cpu/m3_ctl_v3/ice_bridge.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef ICE_BRIDGE_H
diff --git a/simulator/cpu/m3_ctl_v3/m3_ctl.c b/simulator/cpu/m3_ctl_v3/m3_ctl.c
index 877b8cd6..33d9c006 100644
--- a/simulator/cpu/m3_ctl_v3/m3_ctl.c
+++ b/simulator/cpu/m3_ctl_v3/m3_ctl.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include <unistd.h>
diff --git a/simulator/cpu/m3_ctl_v3/m3_ctl.h b/simulator/cpu/m3_ctl_v3/m3_ctl.h
index b2b20822..e5e5eb81 100644
--- a/simulator/cpu/m3_ctl_v3/m3_ctl.h
+++ b/simulator/cpu/m3_ctl_v3/m3_ctl.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef M3_CTL_H
diff --git a/simulator/cpu/m3_ctl_v3/memmap.h b/simulator/cpu/m3_ctl_v3/memmap.h
index dbafeabe..b02e3018 100644
--- a/simulator/cpu/m3_ctl_v3/memmap.h
+++ b/simulator/cpu/m3_ctl_v3/memmap.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef MEMMAP_H
diff --git a/simulator/cpu/m3_ctl_v3/static_rom.c b/simulator/cpu/m3_ctl_v3/static_rom.c
index aeb9d72a..8aa99d58 100644
--- a/simulator/cpu/m3_ctl_v3/static_rom.c
+++ b/simulator/cpu/m3_ctl_v3/static_rom.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2013  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 // bintoarray.sh; "blink.bin"
diff --git a/simulator/cpu/m3_ctl_v3/static_rom.h b/simulator/cpu/m3_ctl_v3/static_rom.h
index ad8c7f27..9e0f2020 100644
--- a/simulator/cpu/m3_ctl_v3/static_rom.h
+++ b/simulator/cpu/m3_ctl_v3/static_rom.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2013  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef STATIC_ROM_H
diff --git a/simulator/cpu/m3_prc_v9/m3_prc.c b/simulator/cpu/m3_prc_v9/m3_prc.c
index 48fda0e8..91e41ae2 100644
--- a/simulator/cpu/m3_prc_v9/m3_prc.c
+++ b/simulator/cpu/m3_prc_v9/m3_prc.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2015  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include <unistd.h>
diff --git a/simulator/cpu/m3_prc_v9/m3_prc.h b/simulator/cpu/m3_prc_v9/m3_prc.h
index a81248ab..a3ec0b16 100644
--- a/simulator/cpu/m3_prc_v9/m3_prc.h
+++ b/simulator/cpu/m3_prc_v9/m3_prc.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2015  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef M3_PRC_H
diff --git a/simulator/cpu/m3_prc_v9/memmap.h b/simulator/cpu/m3_prc_v9/memmap.h
index 57da5e23..8973374d 100644
--- a/simulator/cpu/m3_prc_v9/memmap.h
+++ b/simulator/cpu/m3_prc_v9/memmap.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef MEMMAP_H
diff --git a/simulator/cpu/m3_prc_v9/static_rom.c b/simulator/cpu/m3_prc_v9/static_rom.c
index 6c2c1422..3e5e8c01 100644
--- a/simulator/cpu/m3_prc_v9/static_rom.c
+++ b/simulator/cpu/m3_prc_v9/static_rom.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2013  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 // bintoarray.sh; "blink.bin"
diff --git a/simulator/cpu/m3_prc_v9/static_rom.h b/simulator/cpu/m3_prc_v9/static_rom.h
index 0e84dd10..91dedc2b 100644
--- a/simulator/cpu/m3_prc_v9/static_rom.h
+++ b/simulator/cpu/m3_prc_v9/static_rom.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2013  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef STATIC_ROM_H
diff --git a/simulator/cpu/misc.c b/simulator/cpu/misc.c
index edc1344d..8107b9f2 100644
--- a/simulator/cpu/misc.c
+++ b/simulator/cpu/misc.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "misc.h"
diff --git a/simulator/cpu/misc.h b/simulator/cpu/misc.h
index 288dc5e3..c36e6f79 100644
--- a/simulator/cpu/misc.h
+++ b/simulator/cpu/misc.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef MISC_H
diff --git a/simulator/cpu/periph.h b/simulator/cpu/periph.h
index 29758a1c..f923d86f 100644
--- a/simulator/cpu/periph.h
+++ b/simulator/cpu/periph.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef PERIPH_H
diff --git a/simulator/cpu/registers.c b/simulator/cpu/registers.c
index c41455ef..8d4ca4ae 100644
--- a/simulator/cpu/registers.c
+++ b/simulator/cpu/registers.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include MEMMAP_HEADER
diff --git a/simulator/cpu/registers.h b/simulator/cpu/registers.h
index cb07d9ad..c3e55195 100644
--- a/simulator/cpu/registers.h
+++ b/simulator/cpu/registers.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2012  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef REGISTERS_H
diff --git a/simulator/cpu/sam4l/ast.c b/simulator/cpu/sam4l/ast.c
index 3f82e7db..a0ab35d4 100644
--- a/simulator/cpu/sam4l/ast.c
+++ b/simulator/cpu/sam4l/ast.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "ast.h"
diff --git a/simulator/cpu/sam4l/ast.h b/simulator/cpu/sam4l/ast.h
index d27c532b..4d1e011b 100644
--- a/simulator/cpu/sam4l/ast.h
+++ b/simulator/cpu/sam4l/ast.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef AST_H
diff --git a/simulator/cpu/sam4l/bpm.c b/simulator/cpu/sam4l/bpm.c
index 1f0687f3..8ddc2afc 100644
--- a/simulator/cpu/sam4l/bpm.c
+++ b/simulator/cpu/sam4l/bpm.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "bpm.h"
diff --git a/simulator/cpu/sam4l/bpm.h b/simulator/cpu/sam4l/bpm.h
index 7c25407c..58b9b77b 100644
--- a/simulator/cpu/sam4l/bpm.h
+++ b/simulator/cpu/sam4l/bpm.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef BPM_H
diff --git a/simulator/cpu/sam4l/gpio.c b/simulator/cpu/sam4l/gpio.c
index 600126fa..cafd5023 100644
--- a/simulator/cpu/sam4l/gpio.c
+++ b/simulator/cpu/sam4l/gpio.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "gpio.h"
diff --git a/simulator/cpu/sam4l/gpio.h b/simulator/cpu/sam4l/gpio.h
index f05e229e..f8b3dff7 100644
--- a/simulator/cpu/sam4l/gpio.h
+++ b/simulator/cpu/sam4l/gpio.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef GPIO_H
diff --git a/simulator/cpu/sam4l/memmap.h b/simulator/cpu/sam4l/memmap.h
index 6c98b42d..0e376280 100644
--- a/simulator/cpu/sam4l/memmap.h
+++ b/simulator/cpu/sam4l/memmap.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef MEMMAP_H
diff --git a/simulator/cpu/sam4l/pm.c b/simulator/cpu/sam4l/pm.c
index 924c0c8c..283d9e5f 100644
--- a/simulator/cpu/sam4l/pm.c
+++ b/simulator/cpu/sam4l/pm.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "pm.h"
diff --git a/simulator/cpu/sam4l/pm.h b/simulator/cpu/sam4l/pm.h
index 6ac8524a..3233f975 100644
--- a/simulator/cpu/sam4l/pm.h
+++ b/simulator/cpu/sam4l/pm.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef PM_H
diff --git a/simulator/cpu/sam4l/spi.c b/simulator/cpu/sam4l/spi.c
index 56f8851b..19e44fc5 100644
--- a/simulator/cpu/sam4l/spi.c
+++ b/simulator/cpu/sam4l/spi.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "spi.h"
diff --git a/simulator/cpu/sam4l/spi.h b/simulator/cpu/sam4l/spi.h
index d457b8c0..88fac04d 100644
--- a/simulator/cpu/sam4l/spi.h
+++ b/simulator/cpu/sam4l/spi.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef SPI_H
diff --git a/simulator/cpu/sam4l/static_rom.c b/simulator/cpu/sam4l/static_rom.c
index 157535e6..b031e1dc 100644
--- a/simulator/cpu/sam4l/static_rom.c
+++ b/simulator/cpu/sam4l/static_rom.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2013  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 // bintoarray.sh; "kernel_and_app.bin"
diff --git a/simulator/cpu/sam4l/static_rom.h b/simulator/cpu/sam4l/static_rom.h
index 0fd06428..1aa67cea 100644
--- a/simulator/cpu/sam4l/static_rom.h
+++ b/simulator/cpu/sam4l/static_rom.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2013  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef STATIC_ROM_H
diff --git a/simulator/cpu/sam4l/wdt.c b/simulator/cpu/sam4l/wdt.c
index 94b1de10..2f1f3b50 100644
--- a/simulator/cpu/sam4l/wdt.c
+++ b/simulator/cpu/sam4l/wdt.c
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #include "wdt.h"
diff --git a/simulator/cpu/sam4l/wdt.h b/simulator/cpu/sam4l/wdt.h
index dc222c3e..4baa212b 100644
--- a/simulator/cpu/sam4l/wdt.h
+++ b/simulator/cpu/sam4l/wdt.h
@@ -1,20 +1,8 @@
-/* Mulator - An extensible {ARM} {e,si}mulator
- * Copyright 2011-2016  Pat Pannuto <pat.pannuto@gmail.com>
+/* Mulator - An extensible {e,si}mulator
+ * Copyright 2011-2020 Pat Pannuto <pat.pannuto@gmail.com>
  *
- * This file is part of Mulator.
- *
- * Mulator is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Mulator is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Mulator.  If not, see <http://www.gnu.org/licenses/>.
+ * Licensed under either of the Apache License, Version 2.0
+ * or the MIT license, at your option.
  */
 
 #ifndef WDT_H