diff --git a/LICENSE.txt b/LICENSE.txt
index 332b14517..ca7fc7c14 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,5 +1,8 @@
-WorldEdit License
------------------
+--------------------
+Contribution License
+--------------------
+
+New contributions must be licensed under:
 
                    GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
@@ -168,6 +171,634 @@ permanent authorization for you to choose that version for the
 Library.
 
 
+-----------------
+WorldEdit License
+-----------------
+
+WorldEdit as a whole is licensed under:
+
+                    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.
+
+
+------------
 JNBT License
 ------------
 
@@ -201,6 +832,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE. 
 
 
+----------------
 JChronic License
 ----------------
 
diff --git a/LICENSE_LGPL.txt b/LICENSE_LGPL.txt
deleted file mode 100644
index 02bbb60bc..000000000
--- a/LICENSE_LGPL.txt
+++ /dev/null
@@ -1,165 +0,0 @@
-                   GNU LESSER 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.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser 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
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
\ No newline at end of file
diff --git a/README.html b/README.html
index 9d6dea895..5db999041 100644
--- a/README.html
+++ b/README.html
@@ -1,83 +1,197 @@
 <!DOCTYPE html>
 <html>
 <head>
-<title>WorldEdit ${version}</title>
+<title>${project.name} ${version}</title>
+<link href="http://fonts.googleapis.com/css?family=Source+Sans+Pro:400,700|Ropa+Sans" rel="stylesheet" type="text/css">
 <style>
 body {
-  margin: 0;
-  padding: 20px;
-  background: #efefef;
-  color: #333;
-  line-height: 1.5;
+    margin: 0;
+    padding: 3em 1em;
+    background: #efefef;
+    color: #333;
+    line-height: 1.5;
 }
 #wrapper {
-  margin: 1em auto 1em auto;
-  width: 600px;
-  background: #fff;
-  padding: 3em;
-  -moz-border-radius: 0.5em;
-  -webkit-border-radius: 0.5em;
-  border-radius: 0.5em;
-  border: 1px solid #ccc;
-  box-shadow: 0 0.3em 0.6em rgba(0, 0, 0, 0.1);
-  line-height: 1.4;
+    width: 600px;
+    margin: auto;
 }
 body, th, td, input {
-  font: 0.8em sans-serif;
+    font: 14px 'Source Sans Pro', Arial, sans-serifsans-serif;
+}
+.section {
+	background: #fff;
+	position: relative;
+	padding: 2em 2.4em;
+	margin: 3em auto 4em auto;
+    width: 80%;
+    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+    -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+}
+.section:before, .section:after {
+	content: "";
+	position: absolute;
+	z-index: -2;
+}
+.section {
+    -moz-border-radius: 4px;
+    border-radius: 4px;
+}
+.section:before, .section:after {
+	bottom: 15px;
+	left: 10px;
+	width: 50%;
+	height: 20%;
+	max-width: 300px;
+	max-height: 100px;
+    -webkit-box-shadow: 0 15px 10px rgba(0, 0, 0, 0.5);
+    -moz-box-shadow: 0 15px 10px rgba(0, 0, 0, 0.5);
+    box-shadow: 0 15px 10px rgba(0, 0, 0, 0.5);
+    -webkit-transform: rotate(-1deg);
+    -moz-transform: rotate(-1deg);
+    -ms-transform: rotate(-1deg);
+    -o-transform: rotate(-1deg);
+    transform: rotate(-1deg);
+}
+.section:after {
+    right: 10px;
+    left: auto;
+    -webkit-transform: rotate(1deg);
+    -moz-transform: rotate(1deg);
+    -ms-transform: rotate(1deg);
+    -o-transform: rotate(1deg);
+    transform: rotate(1deg);
 }
 a:link, a:visited {
-  color: #0004b2;   
-  text-decoration: none;
+    color: #0004b2;   
+    text-decoration: none;
 }
 a:hover {
-  color: #ac0000;
-  text-decoration: none;
-  border-bottom: 1px solid #999;
+    color: #ac0000;
+    text-decoration: none;
+    border-bottom: 1px solid #999;
 }
 h1 {
-  font: 2.2em 'Trebuchet MS', Helvetica, Arial, sans-serif;
-  color: #ff6900;
-  margin: 0 0;
-  padding: 0 0 0.2em 0;
-  font-weight: normal;
+    font: 2.7em 'Ropa Sans', 'Trebuchet MS', Helvetica, Arial, sans-serif;
+    color: #000;
+    margin: 0 0;
+    padding: 0 0 0.2em 0;
+    font-weight: normal;
+    text-align: center;
+    text-shadow: 2px 2px #FFF;
 }
 h2 {
-  font: 1.4em 'Trebuchet MS', Helvetica, Arial, sans-serif;
-  color: #555;
-  margin: 1.6em 0 1em 0;
-  padding: 0 0 0.2em 0;
-  border-bottom: 1px solid #CCC;
-  font-weight: bold;
+    font-size: 1.3em;
+    color: #FFF;
+    margin: -2.5em 0 0.8em 0;
+    float: left;
+    background: #FF6900;
+    padding: 0.4em 0.8em;
+    border-radius: 0.2em;
+    font-weight: normal;
+    text-align: center; 
+}
+h3 {
+    text-transform: uppercase;
+    font-weight: bold;
+}
+h2 + * {
+    clear: both;
+}
+@media (max-width: 650px) {
+    #wrapper {
+        width: 100%;
+    }
 }
 </style>
 </head>
 <body>
 
 <div id="wrapper">
-
-<h1>WorldEdit ${version}</h1>
-<p>Thanks for choosing WorldEdit! WorldEdit provides you with powerful in-game map editing tools and it is an indispensable tool for both creative and survival play.</p>
-<h2>Relevant links</h2>
-<p>You can find information on how to install, configure, and use WorldEdit on our wiki.</p>
-<ul>
-  <li><a href="http://wiki.sk89q.com/wiki/WorldEdit/Installation">Installation</a></li>
-  <li><a href="http://wiki.sk89q.com/wiki/WorldEdit/Upgrading">Upgrading</a></li>
-  <li><a href="http://wiki.sk89q.com/wiki/WorldEdit/Changelog">Changelog</a></li>
-  <li><a href="http://wiki.sk89q.com/wiki/WorldEdit#Usage">Documentation</a></li>
-</ul>
-<h2>Getting help</h2>
-<p>Need help? Check out our <a href="http://wiki.sk89q.com/wiki/WorldEdit/Support">support information page</a>.<a href="skq.me/irc/irc.esper.net/worldedit"></a></p>
-<p>There, you can learn how to:</p>
-<ul>
-  <li>How to join IRC chat and ask questions</li>
-  <li>Where to report bugs and request features</li>
-</ul>
-<h2>Contributing</h2>
-<p>WorldEdit is entirely open source! You can download all of the plugin code to learn from it, modify it for your own self, or even contribute back!</p>
-<ul>
-  <li><a href="http://wiki.sk89q.com/wiki/WorldEdit/Development">More information</a></li>
-</ul>
-<p><small>Maven information: ${groupId}/${artifactId}/${version}</small></p>
+    <h1>${project.name} ${version}</h1>
+    <div class="section">
+        <h2>Getting Started</h2>
+        <p>
+            Thanks for choosing ${project.name}! When you first install ${project.name},
+            no one will be able to do anything until you give permissions (unless everyone is an op).
+            Because ${project.name} is largely command-driven, it has no effect until
+            someone uses its commands, you can install WorldEdit and deal with
+            configuration whenever you are ready.
+        </p>
+        <ul>
+            <li><a href="http://wiki.sk89q.com/wiki/${project.name}/Installation">How do I install ${project.name}?</a></li>
+            <li><a href="http://wiki.sk89q.com/wiki/${project.name}/Upgrading">How do I update ${project.name}?</a></li>
+            <li><a href="http://wiki.sk89q.com/wiki/${project.name}#Usage">How do I use ${project.name}?</a></li>
+        </ul>
+        <p>
+            Need help?
+            <a href="http://wiki.sk89q.com/wiki/${project.name}/Support">See the ways that you can get assistance</a>.
+        </p>
+    </div>
+    <div class="section">
+        <h2>Common Issues</h2>
+        
+        <h3>I or others don't have permission to build.</h3>
+        <p>
+            This is not a problem caused by ${project.name}.
+            ${project.name} doesn't deny build permissions as it is merely
+            a world editing program.
+        </p>
+        
+        <h3>${project.name} doesn't seem to work.</h3>
+        <p>
+            A common mistake is making
+            a syntax error in one of ${project.name}'s configuration files (this is very
+            fatal unfortunately, and can be caused by a single character typed in the wrong place). Try 
+            <a href="http://wiki.sk89q.com/wiki/${project.name}/Support">asking in IRC</a>
+            to see whether anyone can help you.
+        </p>
+        
+        <h3>Can I use this with mod blocks?</h3>
+        <p>
+            Yes, <a href="http://wiki.sk89q.com/wiki/WorldEdit/Introduction#Block_support">depending on what you are using WorldEdit with</a>
+            (Bukkit, Single Player Commands, MinecraftEdu, etc.). We don't guarantee
+            100% compatibility with all known custom blocks,
+            <a href="http://www.youtube.com/watch?v=FkCtjBL-7vs">but we have pretty
+            decent support</a>. Please be aware that support for these mods is
+            considered 'experimental,' and will likely be for the far forseeable
+            future.
+        </p>
+        
+        <h3>How do I protect my spawn?</h3>
+        <p>
+            You'll have to install our accompanying WorldGuard plugin, which works
+            in conjunction with ${project.name} in order to protect areas. With it,
+            you can make a selection with WorldEdit and then 'define' a region
+            that prevents other from building in it.
+        </p>
+        
+        <h3>Can I use ${project.name}'s selections in my Bukkit plugin?</h3>
+        <p>
+            Absolutely! We haven't documented how to yet, but you can try
+            looking at the <a href="http://docs.sk89q.com/worldedit/apidocs/com/sk89q/worldedit/bukkit/WorldEditPlugin.html">Javadocs</a>
+            for the plugin's main class. You'll have to get a reference to WorldEdit
+            from Bukkit's plugin manager (don't try to create WorldEditPlugin), and then
+            call one of its selection methods.
+        </p>
+        
+        <p>
+            Still need help?
+            <a href="http://wiki.sk89q.com/wiki/${project.name}/Support">See the ways that you can get assistance</a>.
+        </p>
+    </div>
+    <div class="section">
+        <h2>Contributing</h2>
+        <p>
+            Did you know that ${project.name} is open source? That means that you can
+            read the code and learn from it, as well as modify it and submit back
+            changes to help the community!
+        </p>
+        <ul>
+            <li><a href="https://github.com/sk89q/worldedit">View the source code</a></li>
+            <li><a href="http://wiki.sk89q.com/wiki/${project.name}/Development">More information</a></li>
+        </ul>
+    </div>
 </div>
 </body>
 </html>
\ No newline at end of file
diff --git a/README.md b/README.md
index 82402c9e3..c7c76ff0a 100644
--- a/README.md
+++ b/README.md
@@ -1,56 +1,36 @@
-WorldEdit
+![WorldEdit](http://static.sk89q.com/readme/worldedit.png)
 =========
 
-WorldEdit is a voxel and block manipulation library for Minecraft. It is
-primarily a library but bindings to Bukkit (included) and SPC (external)
-are available.
+WorldEdit is an easy-to-use in-game world editor for Minecraft, supporting both single 
+player and multiplayer, that lets you:
 
+* Change thousands of blocks in an area at once by selecting regions.
+* Use over 100 functions to modify the world or remove problems.
+* Remove large chunks of land as you wish.
+* Sculpt the world and build mountains with brushes.
+* Fix annoyances such as broken water, missing snow, raging fires, and more.
+
+WorldEdit is open source and is available under the GNU General Public License v3.
 
 Compiling
 ---------
 
-You need to have Maven installed (http://maven.apache.org). Once installed,
-simply run:
-
-    mvn clean install
-
-Maven will automatically download dependencies for you. Note: For that to work,
-be sure to add Maven to your "PATH".
-
-
-Compiling branches from pull requests
--------------------------------------
-WARNING: This is not recommended if you dont understand the changes and/or
-         trust the sender of the pull request!
-
-You need to have Maven and Git installed.
-
-Run the following commands:
-
-    git clone -b <branch> git://github.com/<author>/worldedit.git <directory>
-    cd <directory>
-    mvn clean package
-
-The <directory> is just a directory name you can pick at your leisure
-The other placeholders should be filled in from the pull request's headline:
-
-    <author> wants someone to merge 1 commit into sk89q:master from <author>:<branch> 
-
-
-Issue Tracker
--------------
-
-Please submit bug reports and feature requests here:
-http://redmine.sk89q.com/projects/worldedit/issues
+The project is written for Java 6 and our build process makes use of [Maven](http://maven.apache.org). Detailed compilation information [can be found on the wiki](http://wiki.sk89q.com/wiki/WorldEdit/Development#Compiling).
 
+Dependencies are automatically handled by Maven.
 
 Contributing
 ------------
 
-We happily accept contributions. The best way to do this is to fork
-WorldEdit on GitHub, add your changes, and then submit a pull request. We'll
-look at it, make comments, and merge it into WorldEdit if everything
-works out.
+We happily accept contributions, especially through pull requests on GitHub. Submissions 
+must be licensed under the GNU Lesser General Public License v3.
 
-All new submissions have to be licensed under the GNU Lesser General
-Public License v3, which is outlined inside LICENSE_LGPL.txt.
\ No newline at end of file
+Please see [the wiki for further information about contributing](http://wiki.sk89q.com/wiki/WorldEdit/Development#Contributing).
+
+Links
+-----
+
+* [IRC channel](http://skq.me/irc/irc.esper.net/sk89q/) (#sk89q on irc.esper.net)
+* [Issue tracker](http://redmine.sk89q.com)
+* [Continuous integration](http://build.sk89q.com) [![Build Status](https://secure.travis-ci.org/sk89q/worldedit.png)](http://travis-ci.org/sk89q/worldedit)
+* [End-user documentation](http://wiki.sk89q.com/wiki/WorldEdit)
\ No newline at end of file
diff --git a/contrib/craftscripts/README.txt b/contrib/craftscripts/README.txt
new file mode 100644
index 000000000..607196a4e
--- /dev/null
+++ b/contrib/craftscripts/README.txt
@@ -0,0 +1,15 @@
+CraftScripts are script files for WorldEdit that let you write world
+editing scripts with JavaScript easily.
+
+Example usage:
+/cs maze.js lightstone 10 10
+
+You may or may not install these scripts -- it is optional. If you are, however,
+place the entire craftscripts/ folder into the respective directory for the platform
+that you have installed WorldEdit for
+(see http://wiki.sk89q.com/wiki/WorldEdit/Installation).
+
+In order to be able to use CraftScripts, you must install the Rhino JavaScript library.
+The installation page linked above has information about that. More information
+about scripts in general can be found at
+http://wiki.sk89q.com/wiki/WorldEdit/Scripting
\ No newline at end of file
diff --git a/craftscripts/SUBMITTING.txt b/contrib/craftscripts/SUBMITTING.txt
similarity index 89%
rename from craftscripts/SUBMITTING.txt
rename to contrib/craftscripts/SUBMITTING.txt
index a41bb3fee..d39505cf5 100644
--- a/craftscripts/SUBMITTING.txt
+++ b/contrib/craftscripts/SUBMITTING.txt
@@ -1,10 +1,10 @@
-Write a cool script? Send it to sk89q (somehow) or you can submit a pull
-request on https://github.com/sk89q/worldedit. He will consider your script
-for inclusion in WorldEdit releases. Please license your script with a
-permissive open source license such as GPLv2, MIT, BSD, WTFPL, etc.
-
-Note: Legally you should not release things to the public domain as not
-all countries have the concept of public domain in their copyright law.
-
-You can also post your scripts here:
+Write a cool script? Send it to sk89q (somehow) or you can submit a pull
+request on https://github.com/sk89q/worldedit. He will consider your script
+for inclusion in WorldEdit releases. Please license your script with a
+permissive open source license such as GPLv2, MIT, BSD, WTFPL, etc.
+
+Note: Legally you should not release things to the public domain as not
+all countries have the concept of public domain in their copyright law.
+
+You can also post your scripts here:
 http://forum.sk89q.com/forums/craftscripts.6/
\ No newline at end of file
diff --git a/craftscripts/draw.js b/contrib/craftscripts/draw.js
similarity index 100%
rename from craftscripts/draw.js
rename to contrib/craftscripts/draw.js
diff --git a/craftscripts/maze.js b/contrib/craftscripts/maze.js
similarity index 96%
rename from craftscripts/maze.js
rename to contrib/craftscripts/maze.js
index 1957f3026..d76a9236e 100644
--- a/craftscripts/maze.js
+++ b/contrib/craftscripts/maze.js
@@ -1,132 +1,132 @@
-// $Id$
-/*
- * Maze generator CraftScript for WorldEdit
- * Copyright (C) 2010, 2011 sk89q <http://www.sk89q.com>
- *
- * 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/>.
-*/
-
-importPackage(Packages.com.sk89q.worldedit);
-importPackage(Packages.com.sk89q.worldedit.blocks);
-
-context.checkArgs(1, -1, "<block> [width] [length]");
-
-var sess = context.remember();
-
-// This may throw an exception that is caught by the script processor
-var block = context.getBlock(argv[1]);
-var w = argv.length > 2 ? parseInt(argv[2]) : 5;
-var h = argv.length > 3 ? parseInt(argv[3]) : 5;
-
-function id(x, y) {
-    return y * (w + 1) + x;
-}
-
-function $x(i) {
-    return i % (w + 1);
-}
-
-function $y(i) {
-    return Math.floor(i / (w + 1));
-}
-
-function shuffle(arr) {
-    var i = arr.length;
-    if (i == 0) return false;
-    while (--i) {
-        var j = Math.floor(Math.random() * (i + 1));
-        var tempi = arr[i];
-        var tempj = arr[j];
-        arr[i] = tempj;
-        arr[j] = tempi;
-    }
-}
-
-var stack = [];
-var visited = {};
-var noWallLeft = new Array(w * h);
-var noWallAbove = new Array(w * h);
-var current = 0;
-
-stack.push(id(0, 0))
-
-while (stack.length > 0) {
-    var cell = stack.pop();
-    var x = $x(cell), y = $y(cell);
-    visited[cell] = true;
-    
-    var neighbors = []
-    
-    if (x > 0) neighbors.push(id(x - 1, y));
-    if (x < w - 1) neighbors.push(id(x + 1, y));
-    if (y > 0) neighbors.push(id(x, y - 1));
-    if (y < h - 1) neighbors.push(id(x, y + 1));
-    
-    shuffle(neighbors);
-    
-    while (neighbors.length > 0) {
-        var neighbor = neighbors.pop();
-        var nx = $x(neighbor), ny = $y(neighbor);
-        
-        if (visited[neighbor] != true) {
-            stack.push(cell);
-            
-            if (y == ny) {
-                if (nx < x) {
-                    noWallLeft[cell] = true;
-                } else {
-                    noWallLeft[neighbor] = true;
-                }
-            } else {
-                if (ny < y) {
-                    noWallAbove[cell] = true;
-                } else {
-                    noWallAbove[neighbor] = true;
-                }
-            }
-            
-            stack.push(neighbor);
-            break;
-        }
-    }
-}
-
-/*for (var y = -1; y < h; y++) {
-    var line = "";
-    for (var x = 0; x <= w; x++) {
-        var cell = id(x, y)
-        var l = y >= 0 ? (noWallLeft[cell] ? "_" : "|") : "_";
-        var b = x < w ? (noWallAbove[id(x, y + 1)] ? "  " : "_") : "";
-        line += l + b;
-    }
-    context.print(line);
-}*/
-
-var origin = player.getBlockIn();
-
-for (var y = 0; y <= h; y++) {
-    for (var x = 0; x <= w; x++) {
-        var cell = id(x, y)
-        if (!noWallLeft[cell] && y < h) {
-            sess.setBlock(origin.add(x * 2 - 1, 0, y * 2), block);
-            sess.setBlock(origin.add(x * 2 - 1, 1, y * 2), block);
-        }
-        if (!noWallAbove[cell] && x < w) {
-            sess.setBlock(origin.add(x * 2, 0, y * 2 - 1), block);
-            sess.setBlock(origin.add(x * 2, 1, y * 2 - 1), block);
-        }
-        sess.setBlock(origin.add(x * 2 - 1, 0, y * 2 - 1), block);
-        sess.setBlock(origin.add(x * 2 - 1, 1, y * 2 - 1), block);
-    }
+// $Id$
+/*
+ * Maze generator CraftScript for WorldEdit
+ * Copyright (C) 2010, 2011 sk89q <http://www.sk89q.com>
+ *
+ * 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/>.
+*/
+
+importPackage(Packages.com.sk89q.worldedit);
+importPackage(Packages.com.sk89q.worldedit.blocks);
+
+context.checkArgs(1, -1, "<block> [width] [length]");
+
+var sess = context.remember();
+
+// This may throw an exception that is caught by the script processor
+var block = context.getBlock(argv[1]);
+var w = argv.length > 2 ? parseInt(argv[2]) : 5;
+var h = argv.length > 3 ? parseInt(argv[3]) : 5;
+
+function id(x, y) {
+    return y * (w + 1) + x;
+}
+
+function $x(i) {
+    return i % (w + 1);
+}
+
+function $y(i) {
+    return Math.floor(i / (w + 1));
+}
+
+function shuffle(arr) {
+    var i = arr.length;
+    if (i == 0) return false;
+    while (--i) {
+        var j = Math.floor(Math.random() * (i + 1));
+        var tempi = arr[i];
+        var tempj = arr[j];
+        arr[i] = tempj;
+        arr[j] = tempi;
+    }
+}
+
+var stack = [];
+var visited = {};
+var noWallLeft = new Array(w * h);
+var noWallAbove = new Array(w * h);
+var current = 0;
+
+stack.push(id(0, 0))
+
+while (stack.length > 0) {
+    var cell = stack.pop();
+    var x = $x(cell), y = $y(cell);
+    visited[cell] = true;
+    
+    var neighbors = []
+    
+    if (x > 0) neighbors.push(id(x - 1, y));
+    if (x < w - 1) neighbors.push(id(x + 1, y));
+    if (y > 0) neighbors.push(id(x, y - 1));
+    if (y < h - 1) neighbors.push(id(x, y + 1));
+    
+    shuffle(neighbors);
+    
+    while (neighbors.length > 0) {
+        var neighbor = neighbors.pop();
+        var nx = $x(neighbor), ny = $y(neighbor);
+        
+        if (visited[neighbor] != true) {
+            stack.push(cell);
+            
+            if (y == ny) {
+                if (nx < x) {
+                    noWallLeft[cell] = true;
+                } else {
+                    noWallLeft[neighbor] = true;
+                }
+            } else {
+                if (ny < y) {
+                    noWallAbove[cell] = true;
+                } else {
+                    noWallAbove[neighbor] = true;
+                }
+            }
+            
+            stack.push(neighbor);
+            break;
+        }
+    }
+}
+
+/*for (var y = -1; y < h; y++) {
+    var line = "";
+    for (var x = 0; x <= w; x++) {
+        var cell = id(x, y)
+        var l = y >= 0 ? (noWallLeft[cell] ? "_" : "|") : "_";
+        var b = x < w ? (noWallAbove[id(x, y + 1)] ? "  " : "_") : "";
+        line += l + b;
+    }
+    context.print(line);
+}*/
+
+var origin = player.getBlockIn();
+
+for (var y = 0; y <= h; y++) {
+    for (var x = 0; x <= w; x++) {
+        var cell = id(x, y)
+        if (!noWallLeft[cell] && y < h) {
+            sess.setBlock(origin.add(x * 2 - 1, 0, y * 2), block);
+            sess.setBlock(origin.add(x * 2 - 1, 1, y * 2), block);
+        }
+        if (!noWallAbove[cell] && x < w) {
+            sess.setBlock(origin.add(x * 2, 0, y * 2 - 1), block);
+            sess.setBlock(origin.add(x * 2, 1, y * 2 - 1), block);
+        }
+        sess.setBlock(origin.add(x * 2 - 1, 0, y * 2 - 1), block);
+        sess.setBlock(origin.add(x * 2 - 1, 1, y * 2 - 1), block);
+    }
 }
\ No newline at end of file
diff --git a/craftscripts/quickshot.js b/contrib/craftscripts/quickshot.js
similarity index 96%
rename from craftscripts/quickshot.js
rename to contrib/craftscripts/quickshot.js
index f018937dd..e47820ea7 100644
--- a/craftscripts/quickshot.js
+++ b/contrib/craftscripts/quickshot.js
@@ -1,135 +1,135 @@
-// $Id$
-/*
- * Quick shot music layout
- * Copyright (C) 2011 sk89q <http://www.sk89q.com>
- *
- * 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/>.
-*/
-
-importPackage(Packages.com.sk89q.worldedit);
-importPackage(Packages.com.sk89q.worldedit.blocks);
-
-var torchDirs = {}
-torchDirs[PlayerDirection.NORTH] = [2, 4];
-torchDirs[PlayerDirection.SOUTH] = [1, 3];
-torchDirs[PlayerDirection.WEST] = [3, 2];
-torchDirs[PlayerDirection.EAST] = [4, 1];
-
-var pitches = {
-    "f#": 0,
-    "gb": 0,
-    "g": 1,
-    "g#": 2,
-    "ab": 2,
-    "a": 3,
-    "a#": 4,
-    "bb": 4,
-    "b": 5,
-    "c": 6,
-    "c#": 7,
-    "db": 7,
-    "d": 8,
-    "d#": 9,
-    "eb": 9,
-    "e": 10,
-    "f": 11,
-    "f#": 12,
-    "gb": 12,
-}
-
-function generate(dir, notes) {
-    var sess = context.remember();
-
-    var origin = player.getBlockOn();
-    var vec = dir.vector();
-    var right = dir.leftVector().multiply(-1);
-    var base = new BaseBlock(BlockID.DIRT);
-    var instrument = new BaseBlock(BlockID.DIRT);
-    var noteTorch = new BaseBlock(BlockID.REDSTONE_TORCH_ON, torchDirs[dir][1]);
-    var backTorch = new BaseBlock(BlockID.REDSTONE_TORCH_ON, torchDirs[dir][0]);
-    var wire = new BaseBlock(BlockID.REDSTONE_WIRE);
-    
-    var length = 4;
-    
-    for (var i = 0; i < notes.length; i++) {
-        var note = new NoteBlock();
-        note.setNote(notes[i]);
-        
-        var offset = origin.add(vec.multiply(i * length));
-        sess.setBlock(offset, base);
-        sess.setBlock(offset.add(0, 1, 0), wire);
-        
-        var forward1 = offset.add(vec.multiply(1));
-        sess.setBlock(forward1.add(0, 1, 0), base);
-        sess.setBlock(forward1.add(right.multiply(1)).add(0, 0, 0), instrument);
-        sess.setBlock(forward1.add(right.multiply(1)).add(0, 1, 0), noteTorch);
-        sess.setBlock(forward1.add(right.multiply(1)).add(0, 2, 0), note);
-        sess.setBlock(forward1.add(right.multiply(2)), base);
-        sess.setBlock(forward1.add(right.multiply(2)).add(0, 1, 0), wire);
-        
-        var forward2 = offset.add(vec.multiply(2));
-        sess.setBlock(forward2.add(0, 1, 0), base);
-        sess.setBlock(forward2.add(0, 2, 0), wire);
-        sess.setBlock(forward2.add(right.multiply(1)).add(0, 1, 0), base);
-        sess.setBlock(forward2.add(right.multiply(1)).add(0, 2, 0), wire);
-        sess.setBlock(forward2.add(right.multiply(2)).add(0, 1, 0), base);
-        sess.setBlock(forward2.add(right.multiply(2)).add(0, 2, 0), wire);
-        
-        var forward3 = offset.add(vec.multiply(3));
-        sess.setBlock(forward3.add(0, 1, 0), backTorch);
-    }
-}
-
-function main() {
-    context.checkArgs(1, -1, "<note1> [note2] [note...]");
-
-    var dir = player.getCardinalDirection();
-
-    if (!dir.isOrthogonal()) {
-        context.error("You need to be facing at a right angle to the world.");
-        return;
-    }
-    
-    var pattern = new RegExp("^([0-9])(.*)$");
-    var notes = [];
-    
-    for (var i = 1; i < argv.length; i++) {
-        var m = pattern.exec(argv[i])
-        if (m == null) {
-            context.error("Bad format (expected [octave][note]): " + argv[i]);
-            return;
-        }
-        
-        var octave = parseInt(m[1]);
-        var n = m[2].toLowerCase();
-        
-        if (octave < 1 || octave > 2) {
-            context.error("Valid octaves: 1 2");
-            return;
-        }
-        
-        if (!(n in pitches)) {
-            context.error("Unknown note: " + n);
-            return;
-        }
-        
-        notes.push((octave - 1) * 12 + pitches[n]);
-    }
-    
-    context.print(notes);
-    
-    generate(dir, notes);
-}
-
+// $Id$
+/*
+ * Quick shot music layout
+ * Copyright (C) 2011 sk89q <http://www.sk89q.com>
+ *
+ * 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/>.
+*/
+
+importPackage(Packages.com.sk89q.worldedit);
+importPackage(Packages.com.sk89q.worldedit.blocks);
+
+var torchDirs = {}
+torchDirs[PlayerDirection.NORTH] = [2, 4];
+torchDirs[PlayerDirection.SOUTH] = [1, 3];
+torchDirs[PlayerDirection.WEST] = [3, 2];
+torchDirs[PlayerDirection.EAST] = [4, 1];
+
+var pitches = {
+    "f#": 0,
+    "gb": 0,
+    "g": 1,
+    "g#": 2,
+    "ab": 2,
+    "a": 3,
+    "a#": 4,
+    "bb": 4,
+    "b": 5,
+    "c": 6,
+    "c#": 7,
+    "db": 7,
+    "d": 8,
+    "d#": 9,
+    "eb": 9,
+    "e": 10,
+    "f": 11,
+    "f#": 12,
+    "gb": 12,
+}
+
+function generate(dir, notes) {
+    var sess = context.remember();
+
+    var origin = player.getBlockOn();
+    var vec = dir.vector();
+    var right = dir.leftVector().multiply(-1);
+    var base = new BaseBlock(BlockID.DIRT);
+    var instrument = new BaseBlock(BlockID.DIRT);
+    var noteTorch = new BaseBlock(BlockID.REDSTONE_TORCH_ON, torchDirs[dir][1]);
+    var backTorch = new BaseBlock(BlockID.REDSTONE_TORCH_ON, torchDirs[dir][0]);
+    var wire = new BaseBlock(BlockID.REDSTONE_WIRE);
+    
+    var length = 4;
+    
+    for (var i = 0; i < notes.length; i++) {
+        var note = new NoteBlock();
+        note.setNote(notes[i]);
+        
+        var offset = origin.add(vec.multiply(i * length));
+        sess.setBlock(offset, base);
+        sess.setBlock(offset.add(0, 1, 0), wire);
+        
+        var forward1 = offset.add(vec.multiply(1));
+        sess.setBlock(forward1.add(0, 1, 0), base);
+        sess.setBlock(forward1.add(right.multiply(1)).add(0, 0, 0), instrument);
+        sess.setBlock(forward1.add(right.multiply(1)).add(0, 1, 0), noteTorch);
+        sess.setBlock(forward1.add(right.multiply(1)).add(0, 2, 0), note);
+        sess.setBlock(forward1.add(right.multiply(2)), base);
+        sess.setBlock(forward1.add(right.multiply(2)).add(0, 1, 0), wire);
+        
+        var forward2 = offset.add(vec.multiply(2));
+        sess.setBlock(forward2.add(0, 1, 0), base);
+        sess.setBlock(forward2.add(0, 2, 0), wire);
+        sess.setBlock(forward2.add(right.multiply(1)).add(0, 1, 0), base);
+        sess.setBlock(forward2.add(right.multiply(1)).add(0, 2, 0), wire);
+        sess.setBlock(forward2.add(right.multiply(2)).add(0, 1, 0), base);
+        sess.setBlock(forward2.add(right.multiply(2)).add(0, 2, 0), wire);
+        
+        var forward3 = offset.add(vec.multiply(3));
+        sess.setBlock(forward3.add(0, 1, 0), backTorch);
+    }
+}
+
+function main() {
+    context.checkArgs(1, -1, "<note1> [note2] [note...]");
+
+    var dir = player.getCardinalDirection();
+
+    if (!dir.isOrthogonal()) {
+        context.error("You need to be facing at a right angle to the world.");
+        return;
+    }
+    
+    var pattern = new RegExp("^([0-9])(.*)$");
+    var notes = [];
+    
+    for (var i = 1; i < argv.length; i++) {
+        var m = pattern.exec(argv[i])
+        if (m == null) {
+            context.error("Bad format (expected [octave][note]): " + argv[i]);
+            return;
+        }
+        
+        var octave = parseInt(m[1]);
+        var n = m[2].toLowerCase();
+        
+        if (octave < 1 || octave > 2) {
+            context.error("Valid octaves: 1 2");
+            return;
+        }
+        
+        if (!(n in pitches)) {
+            context.error("Unknown note: " + n);
+            return;
+        }
+        
+        notes.push((octave - 1) * 12 + pitches[n]);
+    }
+    
+    context.print(notes);
+    
+    generate(dir, notes);
+}
+
 main();
\ No newline at end of file
diff --git a/craftscripts/roof.js b/contrib/craftscripts/roof.js
similarity index 97%
rename from craftscripts/roof.js
rename to contrib/craftscripts/roof.js
index edc3e399a..35e03c244 100644
--- a/craftscripts/roof.js
+++ b/contrib/craftscripts/roof.js
@@ -1,53 +1,53 @@
-// $Id$
-/*
- * Copyright (c) 2011 Bentech
- *
- * 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/>.
-*/
-
-importPackage(Packages.java.io);
-importPackage(Packages.java.awt);
-importPackage(Packages.com.sk89q.worldedit);
-importPackage(Packages.com.sk89q.worldedit.blocks);
-
-var blocks = context.remember();
-var session = context.getSession();
-var region = session.getRegion();
-
-context.checkArgs(1, 1, "<type>");
-
-var blocktype = context.getBlock(argv[1]);
-
-var cycles = region.getLength()
-
-if (region.getWidth() > cycles){
-    cycles = region.getWidth();
-}
-
-cycles = cycles / 2;
-
-for (var c = 0; c < cycles; c++) {
-    for (var w = 0; w < region.getWidth() - (c * 2); w++) {
-        for (var l = 0; l < region.getLength() - (c * 2); l++) {
-            if (w == 0 || w == (region.getWidth() - (c * 2)) - 1 || l == 0 || l == (region.getLength() - (c * 2)) - 1) {
-                var vec = new Vector(
-                    region.getMinimumPoint().getX() + (w + c),
-                    region.getMaximumPoint().getY() + c,
-                    region.getMinimumPoint().getZ() + (l + c));
-                
-                blocks.setBlock(vec, blocktype);
-            }
-        }
-    }
+// $Id$
+/*
+ * Copyright (c) 2011 Bentech
+ *
+ * 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/>.
+*/
+
+importPackage(Packages.java.io);
+importPackage(Packages.java.awt);
+importPackage(Packages.com.sk89q.worldedit);
+importPackage(Packages.com.sk89q.worldedit.blocks);
+
+var blocks = context.remember();
+var session = context.getSession();
+var region = session.getRegion();
+
+context.checkArgs(1, 1, "<type>");
+
+var blocktype = context.getBlock(argv[1]);
+
+var cycles = region.getLength()
+
+if (region.getWidth() > cycles){
+    cycles = region.getWidth();
+}
+
+cycles = cycles / 2;
+
+for (var c = 0; c < cycles; c++) {
+    for (var w = 0; w < region.getWidth() - (c * 2); w++) {
+        for (var l = 0; l < region.getLength() - (c * 2); l++) {
+            if (w == 0 || w == (region.getWidth() - (c * 2)) - 1 || l == 0 || l == (region.getLength() - (c * 2)) - 1) {
+                var vec = new Vector(
+                    region.getMinimumPoint().getX() + (w + c),
+                    region.getMaximumPoint().getY() + c,
+                    region.getMinimumPoint().getZ() + (l + c));
+                
+                blocks.setBlock(vec, blocktype);
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/craftscripts/README.txt b/craftscripts/README.txt
deleted file mode 100644
index 95267ea2f..000000000
--- a/craftscripts/README.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-CraftScripts are script files for WorldEdit that let you write world
-editing scripts easily.
-
-Example usage:
-/cs maze.js lightstone 10 10
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 697d46431..e2d251793 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.sk89q</groupId>
   <artifactId>worldedit</artifactId>
@@ -11,7 +13,7 @@
       <name>GNU General Public License 2.0</name>
       <url>LICENSE.txt</url>
       <distribution>repo</distribution>
-      <comments>License on all old contributions</comments>
+      <comments>License on WorldEdit</comments>
     </license>
     <license>
       <name>GNU Lesser General Public License 3.0</name>
@@ -50,44 +52,26 @@
       <groupId>com.sk89q</groupId>
       <artifactId>dummypermscompat</artifactId>
       <version>1.6</version>
+      <scope>compile</scope>
       <optional>true</optional>
     </dependency>
 
-    <!-- Bukkit -->
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>bukkit</artifactId>
-      <version>1.3.1-R2.0</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.bukkit</groupId>
-      <artifactId>craftbukkit</artifactId>
-      <version>1.3.1-R2.0</version>
-      <optional>true</optional>
-    </dependency>
-
-    <!-- Archive reading library for snapshots -->
     <dependency>
       <groupId>de.schlichtherle</groupId>
       <artifactId>truezip</artifactId>
       <version>6.8.3</version>
+      <scope>compile</scope>
     </dependency>
-
-    <!-- JavaScript library -->
     <dependency>
       <groupId>rhino</groupId>
       <artifactId>js</artifactId>
       <version>1.7R2</version>
+      <scope>compile</scope>
     </dependency>
-
-    <!-- Time related functions, used for snapshots. This is NOT the original
-      jchronic as it has been modified to have some extra timezone related methods
-      (which were hacked in) -->
     <dependency>
       <groupId>com.sk89q</groupId>
-      <artifactId>jchronic</artifactId>
-      <version>0.2.4a </version>
+      <artifactId>jchronic</artifactId> <!-- not original library -->
+      <version>0.2.4a</version>
       <type>jar</type>
       <scope>compile</scope>
     </dependency>
@@ -98,7 +82,20 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- Spout -->
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>bukkit</artifactId>
+      <version>1.3.1-R2.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.bukkit</groupId>
+      <artifactId>craftbukkit</artifactId>
+      <version>1.3.1-R2.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
     <dependency>
       <groupId>org.spout</groupId>
       <artifactId>spoutapi</artifactId>
@@ -123,6 +120,7 @@
     </repository>
   </distributionManagement>
   <build>
+    <defaultGoal>install</defaultGoal>
     <sourceDirectory>${basedir}/src/main/java/</sourceDirectory>
 
     <extensions>
@@ -133,7 +131,6 @@
       </extension>
     </extensions>
 
-    <!-- Resources -->
     <resources>
       <resource>
         <targetPath>.</targetPath>
@@ -154,9 +151,7 @@
       </resource>
     </resources>
 
-    <!-- Plugins -->
     <plugins>
-      <!-- Compile plugin -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
@@ -167,7 +162,6 @@
         </configuration>
       </plugin>
 
-      <!-- JAR creation plugin -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
@@ -189,17 +183,23 @@
         </configuration>
       </plugin>
 
-      <!-- Assembly -->
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <version>2.2-beta-2</version>
         <configuration>
           <descriptor>${basedir}/src/main/assembly/default.xml</descriptor>
         </configuration>
+        <executions>
+          <execution>
+            <id>release</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
 
-      <!-- Shade -->
-      <!-- We want to bundle in some dependencies -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-shade-plugin</artifactId>
@@ -212,7 +212,6 @@
             </goals>
             <configuration>
               <artifactSet>
-                <!-- We want to bundle in the modified jchronic library -->
                 <includes>
                   <include>com.sk89q:jchronic</include>
                 </includes>
@@ -222,7 +221,6 @@
         </executions>
       </plugin>
 
-      <!-- Release -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
@@ -234,7 +232,6 @@
         </configuration>
       </plugin>
 
-      <!-- Exclude non-tests -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -246,7 +243,6 @@
         </configuration>
       </plugin>
 
-      <!-- Site generation -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
diff --git a/src/main/assembly/default.xml b/src/main/assembly/default.xml
index 8d6571ceb..01b9c4fd0 100644
--- a/src/main/assembly/default.xml
+++ b/src/main/assembly/default.xml
@@ -28,7 +28,7 @@
         <include>LICENSE.txt</include>
         <include>CHANGELOG.txt</include>
         <include>NOTICE.txt</include>
-        <include>craftscripts/*</include>
+        <include>contrib/craftscripts/*</include>
       </includes>
     </fileSet>
   </fileSets>