950 files changed, 16599 insertions, 8132 deletions

diff --git a/.gitignore b/.gitignore
index 14ae085a..ea9afa10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-src/com.gluster.storage.management.client/bin
-src/com.gluster.storage.management.core/bin
-src/com.gluster.storage.management.console/bin
-src/com.gluster.storage.management.gateway/WebContent/WEB-INF/classes
+src/org.gluster.storage.management.client/bin
+src/org.gluster.storage.management.core/bin
+src/org.gluster.storage.management.console/bin
+src/org.gluster.storage.management.gateway/WebContent/WEB-INF/classes
diff --git a/CONTRIBUTING b/CONTRIBUTING
new file mode 100644
index 00000000..8b3baa7e
--- /dev/null
+++ b/CONTRIBUTING
@@ -0,0 +1,25 @@
+        Developer's Certificate of Origin 1.1
+
+        By making a contribution to this project, I certify that:
+
+        (a) The contribution was created in whole or in part by me and I
+            have the right to submit it under the open source license
+            indicated in the file; or
+
+        (b) The contribution is based upon previous work that, to the best
+            of my knowledge, is covered under an appropriate open source
+            license and I have the right under that license to submit that
+            work with modifications, whether created in whole or in part
+            by me, under the same open source license (unless I am
+            permitted to submit under a different license), as indicated
+            in the file; or
+
+        (c) The contribution was provided directly to me by some other
+            person who certified (a), (b) or (c) and I have not modified
+            it.
+
+        (d) I understand and agree that this project and the contribution
+            are public and that a record of the contribution (including all
+            personal information I submit with it, including my sign-off) is
+            maintained indefinitely and may be redistributed consistent with
+            this project or the open source license(s) involved.
\ No newline at end of file
diff --git a/COPYING b/COPYING
new file mode 100644
index 00000000..5737cfa2
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+                    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 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 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 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/README b/README
index e69de29b..02ff95f8 100644
--- a/README
+++ b/README
@@ -0,0 +1 @@
+For more info, please visit http://www.gluster.org/
diff --git a/build/create-rpms.sh b/build/create-rpms.sh
index db7ea679..de22d4db 100755
--- a/build/create-rpms.sh
+++ b/build/create-rpms.sh
@@ -1,3 +1,24 @@
+#!/bin/bash
+
+#------------------------------------------------------------------
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Gateway.
+#
+# Gluster Management Gateway 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.
+#
+# Gluster Management Gateway 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/>.
+#------------------------------------------------------------------
+
 FILE_ERR=1
 RPM_ERR=2
 sudo cp glustermg-backend-${VERSION}.tar.gz /usr/src/redhat/SOURCES || exit ${FILE_ERR}
diff --git a/build/gluster-management-console.target b/build/gluster-management-console.target
deleted file mode 100644
index b74d8040..00000000
--- a/build/gluster-management-console.target
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.6"?>
-
-<target includeMode="feature" name="Gluster Storage Platform Target">
-<locations>
-<location path="gmc-target/com.gluster.storage.management.console.target/rcp.sdk.helios.SR1" type="Directory"/>
-<location path="gmc-target/com.gluster.storage.management.console.target/richclientgui.rcptoolbox" type="Directory"/>
-<location path="gmc-target/com.gluster.storage.management.console.target/birt.charts.helios" type="Directory"/>
-<location path="gmc-target/com.gluster.storage.management.console.target/delta.pack.helios" type="Directory"/>
-<location path="gmc-target/com.gluster.storage.management.console.target/org.eclipse.tm.terminal" type="Directory"/>
-</locations>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
diff --git a/src/com.gluster.storage.management.releng/glustermc.rmap b/build/glustermc.rmap
index 73df2b06..73df2b06 100644
--- a/src/com.gluster.storage.management.releng/glustermc.rmap
+++ b/build/glustermc.rmap
diff --git a/src/com.gluster.storage.management.releng/glustermc_build.properties b/build/glustermc_build.properties
index d50782d8..33089eb1 100644
--- a/src/com.gluster.storage.management.releng/glustermc_build.properties
+++ b/build/glustermc_build.properties
@@ -4,8 +4,10 @@
 #buckminster.output.root=/tmp/buckminster/glustermc
 # Where the temp files should go
 #buckminster.temp.root=/tmp/buckminster
+
 # How .qualifier in versions should be replaced
-qualifier.replacement.*=generator:lastRevision
+qualifier.replacement.*=generator:buildTimestamp
+generator.buildTimestamp.format='v'yyyyMMdd-HHmm
 
 # Do not include source
 cbi.include.source=false
diff --git a/build/glustermg.spec b/build/glustermg.spec
index 7e7eb533..d0e3e6a6 100644
--- a/build/glustermg.spec
+++ b/build/glustermg.spec
@@ -5,19 +5,19 @@
 %define current_arch x86
 %endif
 
-Summary:        %{product_family} web IU component
+Summary:        %{product_family} Management Gateway
 Name:           glustermg
 Version:        %{release_version}
 Release:        1%{?extra_release}
-License:        Proprietary
+License:        GPLv3+
 Group:          System Environment/Base
 Source0:        glustermg-backend-%{release_version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-Requires:       tomcat5 >= 5.5.23
+Requires:       tomcat6 >= 6.0.24
 Requires:       java-1.6.0-openjdk >= 1.6.0.0
 Requires:       wget
 %description
-%{product_family} web UI component for GlusterFS and Gluster appliances
+%{product_family} Management Gateway
 
 %package        backend
 Summary:        %{product_family} server side backend tools
@@ -27,10 +27,9 @@ Requires(preun): /sbin/chkconfig
 Requires:       python >= 2.4.3
 Requires:       perl >= 5.8.8
 Requires:       rrdtool-perl >= 1.2.27
-Requires:       appliance-base >= 1.3
 Requires:       sudo
 Requires:       crontabs
-Requires:       samba3
+Requires:       samba >= 3.5.6
 Requires:       libxml2 >= 2.6.26
 %description    backend
 %{product_family} server side backend tools
@@ -67,48 +66,48 @@ ln -sf /opt/glustermg/%{release_version}/backend/gluster_cifs_volume_startup.py
 
 
 %post
-if [ -f /usr/share/tomcat5/webapps/glustermg ]; then
-    rm -f /usr/share/tomcat5/webapps/glustermg
+if [ -f /usr/share/tomcat6/webapps/glustermg ]; then
+    rm -f /usr/share/tomcat6/webapps/glustermg
 fi
-ln -fs /opt/glustermg/%{release_version}/glustermg /usr/share/tomcat5/webapps/glustermg
+ln -fs /opt/glustermg/%{release_version}/glustermg /usr/share/tomcat6/webapps/glustermg
 if [ ! -f /opt/glustermg/keys/gluster.pem ]; then
     ssh-keygen -t rsa -f /opt/glustermg/keys/gluster.pem -N ''
     mv -f /opt/glustermg/keys/gluster.pem.pub /opt/glustermg/keys/gluster.pub
 fi
 chown -R tomcat:tomcat /opt/glustermg /var/log/glustermg
-if ! grep -q '^JAVA_HOME="/usr/lib/jvm/jre-1.6.0-openjdk.x86_64"' /etc/sysconfig/tomcat5; then
-    sed -i 's/^JAVA_HOME=/# JAVA_HOME=/g' /etc/sysconfig/tomcat5
-    echo 'JAVA_HOME="/usr/lib/jvm/jre-1.6.0-openjdk.x86_64"' >> /etc/sysconfig/tomcat5
+if ! grep -q '^JAVA_HOME="/usr/lib/jvm/jre-1.6.0-openjdk.x86_64"' /etc/sysconfig/tomcat6; then
+    sed -i 's/^JAVA_HOME=/# JAVA_HOME=/g' /etc/sysconfig/tomcat6
+    echo 'JAVA_HOME="/usr/lib/jvm/jre-1.6.0-openjdk.x86_64"' >> /etc/sysconfig/tomcat6
 fi
-if ! grep -q '# Added by Gluster: JAVA_OPTS="${JAVA_OPTS} -Xms1024m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m"' /etc/sysconfig/tomcat5; then
-    echo '# Added by Gluster: JAVA_OPTS="${JAVA_OPTS} -Xms1024m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m"' >> /etc/sysconfig/tomcat5
-    echo 'JAVA_OPTS="${JAVA_OPTS} -Xms1024m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m"' >> /etc/sysconfig/tomcat5
+if ! grep -q '# Added by Gluster: JAVA_OPTS="${JAVA_OPTS} -Xms1024m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m"' /etc/sysconfig/tomcat6; then
+    echo '# Added by Gluster: JAVA_OPTS="${JAVA_OPTS} -Xms1024m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m"' >> /etc/sysconfig/tomcat6
+    echo 'JAVA_OPTS="${JAVA_OPTS} -Xms1024m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m"' >> /etc/sysconfig/tomcat6
 fi
-if ! grep -q /usr/share/tomcat5/webapps/glustermg/ssl/gmg-ssl.keystore /etc/tomcat5/server.xml; then
+if ! grep -q /usr/share/tomcat6/webapps/glustermg/ssl/gmg-ssl.keystore /etc/tomcat6/server.xml; then
     sed -i '/<\/Service>/i \
     <Connector SSLEnabled="true" \
                clientAuth="false" \
                executor="tomcatThreadPool" \
                maxThreads="150" \
                port="8443" \
-               keystoreFile="/usr/share/tomcat5/webapps/glustermg/ssl/gmg-ssl.keystore" \
+               keystoreFile="/usr/share/tomcat6/webapps/glustermg/ssl/gmg-ssl.keystore" \
                keystorePass="gluster" \
                protocol="org.apache.coyote.http11.Http11Protocol" \
                scheme="https" \
                secure="true" \
-               sslProtocol="TLS" />' /etc/tomcat5/server.xml
+               sslProtocol="TLS" />' /etc/tomcat6/server.xml
 fi
-if ! grep -q "org.apache.catalina.authenticator.NonLoginAuthenticator" /etc/tomcat5/context.xml; then
+if ! grep -q "org.apache.catalina.authenticator.NonLoginAuthenticator" /etc/tomcat6/context.xml; then
     sed -i '/<\/Context>/i \
     <Valve className="org.apache.catalina.authenticator.NonLoginAuthenticator" \
-           disableProxyCaching="false" />' /etc/tomcat5/context.xml
+           disableProxyCaching="false" />' /etc/tomcat6/context.xml
 fi
 if wget -t 1 -T 1 -q -O /dev/null http://169.254.169.254/latest; then
     sed -i '/<constructor-arg value="multicast"/c <constructor-arg value="none" \/>' /opt/glustermg/%{release_version}/glustermg/WEB-INF/classes/spring/gluster-server-base.xml
 fi
 
 %preun
-rm -f /usr/share/tomcat5/webapps/glustermg
+rm -f /usr/share/tomcat6/webapps/glustermg
 
 %pre backend
 modprobe -q fuse
@@ -139,12 +138,13 @@ if /etc/init.d/multicast-discoverd status >/dev/null; then
 else
     /etc/init.d/multicast-discoverd start
 fi
-/etc/init.d/crond reload
+service crond restart
 /sbin/chkconfig smb on
 /sbin/chkconfig --add gluster-volume-settings
 
 %preun backend
 if [ "$1" = 0 ] ; then
+    /etc/init.d/multicast-discoverd stop
     /sbin/chkconfig --del multicast-discoverd
     /sbin/chkconfig --del gluster-volume-settings
 fi
@@ -176,5 +176,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 13 2011 Bala.FA <barumuga@redhat.com> - 1.1.0
+- crond is restarted instead of reload for fedora 16
+  compatibility
+* Tue Nov 29 2011 Bala.FA <barumuga@redhat.com> - 1.1.0
+- Updated tomcat6/samba dependency
+- Added multicast-discoverd stop in preun backend
 * Thu Aug  4 2011 Bala.FA <bala@gluster.com> - 1.0.0
 - Initial release
diff --git a/build/gmc-buckminster.commands b/build/gmc-buckminster.commands
new file mode 100755
index 00000000..66c776af
--- /dev/null
+++ b/build/gmc-buckminster.commands
@@ -0,0 +1,32 @@
+#------------------------------------------------------------------
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Console.
+#
+# Gluster Management Console 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.
+#
+# Gluster Management Console 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/>.
+#------------------------------------------------------------------
+
+
+# Buckminster commands to build Gluster Management Console
+
+importtarget --active gmc-target/org.gluster.storage.management.console.target/gmc.target
+
+import build/org.gluster.storage.management.console.feature.webstart.cquery
+perform org.gluster.storage.management.console.feature.webstart#buckminster.clean
+perform org.gluster.storage.management.console#update.version
+perform org.gluster.storage.management.console.feature.webstart#create.eclipse.jnlp.product
+perform org.gluster.storage.management.console.feature.webstart#copy.root.files
+perform org.gluster.storage.management.console.feature.webstart#update.version
+perform org.gluster.storage.management.console.feature.webstart#unsign.jars
+perform org.gluster.storage.management.console.feature.webstart#sign.jars
diff --git a/build/gmc-build.sh b/build/gmc-build.sh
index d227ffb1..94f14639 100755
--- a/build/gmc-build.sh
+++ b/build/gmc-build.sh
@@ -1,27 +1,47 @@
-USAGE_ERR=1
+#!/bin/bash
 
-BUILD_DIR=/tmp/buckminster/glustermc
-BUCKMINSTER_URL=http://download.eclipse.org/tools/buckminster/headless-3.6/
-TARGET_PLATFORM_URL=/data/private/gmc-target.git
-SRC_URL=/data/private/gmc-src.git
+#------------------------------------------------------------------
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Console.
+#
+# Gluster Management Console 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.
+#
+# Gluster Management Console 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/>.
+#------------------------------------------------------------------
 
-BUCKMINSTER_PRODUCT_NAME=org.eclipse.buckminster.cmdline.product
-MAIN_FEATURE=com.gluster.storage.management.console.feature.webstart
+set -e
 
-TYPE_ALL="a"
-TYPE_SETUP="s"
-TYPE_BUILD="b"
+GMC_TARGET_URL='git@github.com:gluster/gmc-target.git'
+BUCKMINSTER_URL=http://download.eclipse.org/tools/buckminster/headless-3.7/
+BUCKMINSTER_PRODUCT_NAME=org.eclipse.buckminster.cmdline.product
+GMC_WEBSTART_PROJECT=org.gluster.storage.management.console.feature.webstart
+GMC_CORE_PROJECT=org.gluster.storage.management.core
+GMC_CONSOLE_PROJECT=org.gluster.storage.management.console
+GMG_PROJECT=org.gluster.storage.management.gateway
 
-startBold() {
+startBold() 
+{
 	tput bold
 }
 
-stopBold() {
+stopBold() 
+{
 	tput sgr0
 }
 
 # Shows given text in bold
-showBold() {
+showBold() 
+{
 	startBold
 	echo ${1}
 	stopBold
@@ -30,82 +50,298 @@ showBold() {
 # Get the director that can be used to install headless buckminster
 get_director()
 {
-	echo "Downloading `startBold`director`stopBold`..."
-	wget http://ftp.daum.net/eclipse//tools/buckminster/products/director_latest.zip
-	echo "Installing director..."
-	unzip director_latest.zip
+    mkdir -p ${TOOLS_DIR}
+    cd ${TOOLS_DIR}
+
+    echo "Downloading buckminster director..."
+    wget -c http://ftp.daum.net/eclipse//tools/buckminster/products/director_latest.zip
+    if ! unzip -tqq director_latest.zip; then
+		rm -f director_latest.zip
+		wget http://ftp.daum.net/eclipse//tools/buckminster/products/director_latest.zip
+    fi
+    unzip -q director_latest.zip
+    cd -
 }
 
 install_buckminster()
 {
-	echo "Installing `startBold`Buckminster`stopBold`..."
-	cd director
-	./director -r ${BUCKMINSTER_URL} -d ${BUCKMINSTER_HOME} -p Buckminster -i ${BUCKMINSTER_PRODUCT_NAME}
+    mkdir -p ${BUCKMINSTER_HOME}
+
+    echo "Installing buckminster..."
+    cd ${TOOLS_DIR}/director
+    ./director -r ${BUCKMINSTER_URL} -d ${BUCKMINSTER_HOME} -p Buckminster -i ${BUCKMINSTER_PRODUCT_NAME}
 
-	echo "Setting up Buckminster..."
-	cd ${BUCKMINSTER_HOME}
-	./buckminster install ${BUCKMINSTER_URL} org.eclipse.buckminster.core.headless.feature
-	./buckminster install ${BUCKMINSTER_URL} org.eclipse.buckminster.pde.headless.feature
-	./buckminster install ${BUCKMINSTER_URL} org.eclipse.buckminster.git.headless.feature
-	./buckminster install ${BUCKMINSTER_URL} org.eclipse.buckminster.emma.headless.feature
+    echo "Setting up buckminster..."
+    cd ${BUCKMINSTER_HOME}
+    echo "  => core"
+    ./buckminster install ${BUCKMINSTER_URL} org.eclipse.buckminster.core.headless.feature
+    echo "  => pde"
+    ./buckminster install ${BUCKMINSTER_URL} org.eclipse.buckminster.pde.headless.feature
+    echo "  => git"
+    ./buckminster install ${BUCKMINSTER_URL} org.eclipse.buckminster.git.headless.feature
+    echo "  => emma"
+    ./buckminster install ${BUCKMINSTER_URL} org.eclipse.buckminster.emma.headless.feature
+    cd -
+}
+
+# Create keystore for jar signing (self signed)
+setup_keys()
+{
+    mkdir -p ${KEYS_DIR}
+    cd ${KEYS_DIR}
+    keytool -genkeypair -keystore gluster.keystore -storepass gluster -alias gluster -keyalg RSA << EOF
+Gluster Temp Build
+Gluster
+Gluster
+Dummy
+Dummy
+US
+yes
+EOF
+
+    keytool -selfcert -alias gluster -keystore gluster.keystore << EOF
+gluster
+EOF
+    cd -
 }
 
 configure_workspace()
 {
-	echo "Configuring the workspace..."
-	cd ${WORKSPACE_DIR}
-	rm -rf *
-	git clone ${TARGET_PLATFORM_URL}
-	git clone ${SRC_URL}
+    echo "Configuring the workspace..."
+    rm -rf ${WORKSPACE_DIR}
+    mkdir -p ${WORKSPACE_DIR}
+    cd ${WORKSPACE_DIR}
+
+    for f in $src_dir/*; do
+		ln -s $f
+    done
+
+    if [ ! -e gmc-target ]; then
+		ln -s $gmc_target_dir gmc-target
+    fi
 
-	echo "Importing target platform..."
-	../buckminster importtarget --active gmc-src/com.gluster.storage.management.releng/gluster-management-console.target
-	echo "Importing component query for glustermc..."
-	../buckminster import gmc-src/com.gluster.storage.management.releng/com.gluster.storage.management.console.feature.webstart.cquery
-	cd -
+    echo "Importing target platform..."
+    ${BUCKMINSTER_HOME}/buckminster importtarget -data ${WORKSPACE_DIR} --active gmc-target/org.gluster.storage.management.console.target/gmc.target
+    cd -
 }
 
-build()
+buckminster_perform()
+{
+    ${BUCKMINSTER_HOME}/buckminster perform --properties ${PROPERTIES_FILE} -Dbuckminster.output.root=${DIST_DIR} -data ${WORKSPACE_DIR} $*
+}
+
+build_gmc()
 {
-	echo "Cleaning build directory..."
-	rm -rf ${BUILD_DIR}/*
+    os=${1}
+    ws=${2}
+    arch=${3}
+    cd ${WORKSPACE_DIR}
+    DIST_DIR=${DIST_BASE}/gmc/${os}.${ws}.${arch}
+    if [ ! -d ${DIST_DIR} ]; then
+		mkdir -p ${DIST_DIR}
+    fi
 
-	echo "Exporting the product..."
-	./buckminster perform --properties ${PROPERTIES_FILE} ${MAIN_FEATURE}#create.eclipse.jnlp.product
-	./buckminster perform --properties ${PROPERTIES_FILE} ${MAIN_FEATURE}#copy.root.files
+    echo "Importing component query for glustermc..."
+    ${BUCKMINSTER_HOME}/buckminster import -data ${WORKSPACE_DIR} build/org.gluster.storage.management.console.feature.webstart.cquery
 
-	# buckminster signs the jars using eclipse certificate - hence unsign and sign them again
-	echo "Signing product jars..."
-	./buckminster perform --properties ${PROPERTIES_FILE} ${MAIN_FEATURE}#unsign.jars
-	./buckminster perform --properties ${PROPERTIES_FILE} ${MAIN_FEATURE}#sign.jars
+    echo "Building GMC for [${os}.${ws}.${arch}]"
+    buckminster_perform ${GMC_WEBSTART_PROJECT}#buckminster.clean
+	buckminster_perform -Dproduct.version=${VERSION} ${GMC_CONSOLE_PROJECT}#update.version
+    buckminster_perform -Dtarget.os=${os} -Dtarget.ws=${ws} -Dtarget.arch=${arch} ${GMC_WEBSTART_PROJECT}#create.eclipse.jnlp.product
+    buckminster_perform ${GMC_WEBSTART_PROJECT}#copy.root.files
+    buckminster_perform -Dproduct.version=${VERSION} ${GMC_WEBSTART_PROJECT}#update.version
+
+    # buckminster signs the jars using eclipse certificate - hence unsign and sign them again
+    echo "Signing product jars..."
+    buckminster_perform ${GMC_WEBSTART_PROJECT}#unsign.jars
+    buckminster_perform -Djar.signing.keystore=${KEYS_DIR}/gluster.keystore ${GMC_WEBSTART_PROJECT}#sign.jars
+}
+
+build_gmg()
+{
+    cd ${WORKSPACE_DIR}
+    export DIST_DIR=${DIST_BASE}/gmg
+    if [ ! -d ${DIST_DIR} ]; then
+		mkdir -p ${DIST_DIR}
+    fi
+
+    echo "Importing component query for glustermg..."
+    ${BUCKMINSTER_HOME}/buckminster import -data ${WORKSPACE_DIR} build/org.gluster.storage.management.core.cquery
+    ${BUCKMINSTER_HOME}/buckminster import -data ${WORKSPACE_DIR} build/org.gluster.storage.management.gateway.cquery
+
+    echo "Building CORE..."
+    buckminster_perform ${GMC_CORE_PROJECT}#bundle.jar
+
+    echo "Building Gateway..."
+    buckminster_perform -Dproduct.version=${VERSION} ${GMG_PROJECT}#archive
+
+    echo "Packaging Gateway..."
+    ${SCRIPT_DIR}/package-gateway.sh ${DIST_DIR} ${DIST_BASE}/gmc
+}
+
+package_backend()
+{
+    cd ${WORKSPACE_DIR}
+
+    echo "Packaging backend scripts"
+    export DIST_DIR=${DIST_BASE}/gmg-backend
+    if [ ! -d ${DIST_DIR} ]; then
+		mkdir -p ${DIST_DIR}
+    fi
+
+    ${SCRIPT_DIR}/package-backend.sh ${DIST_DIR}
+}
+
+build_gmc_all()
+{
+    build_gmc linux gtk x86
+    build_gmc linux gtk x86_64
+    build_gmc win32 win32 x86
+    build_gmc win32 win32 x86_64
+    build_gmc macosx cocoa x86
+    build_gmc macosx cocoa x86_64
+}
+
+# Clean the workspace (class files, jar files created during previous build)
+# and the dist directory
+clean()
+{
+	# Remove the core jar file created by previous build
+	/bin/rm -f ${WORKSPACE_DIR}/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.gluster.storage.management.core*jar
+	# Remove compiled class files
+	/bin/rm -rf ${WORKSPACE_DIR}/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/classes/*
+	# Remove old build artifacts
+	/bin/rm -rf ${DIST_BASE}/*
+}
+
+build()
+{
+    export VERSION=${VERSION:-1.0.0alpha}
+	clean
+    build_gmc_all
+    build_gmg
+    package_backend
 }
 
 #-----------------------------------
 # Main Action Body
 #-----------------------------------
+ME=$(basename $0)
+GMC_DIR=$(dirname $(dirname $(readlink -e $0)))
+
+
+function show_help()
+{
+    cat <<EOF
+
+Usage:  `startBold`$ME [-f] [-h] [GMC-TARGET-DIR] [BUILD-DIR]`stopBold`
+
+Build Gluster Management Console from source.
+
+  GMC-TARGET-DIR  -> Directory where gmc-target.git has been or should be cloned
+  BUILD-DIR       -> Directory where build tasks will be performed and binaries will be created
+
+  If not passed, these two directories will be created parallel to ${GMC_DIR}
+
+  Options:
+    -f              -> Force build (re-create build directory and perform build).
+    -h              -> Display this help and exit
+
+  Examples:
+    $ME
+    $ME ~/gmc-target
+    $ME ~/gmc-target ~/gmc-build
+
+EOF
+}
 
-echo
-if [ $# -ne 2 ]; then
-	echo "Usage: ${0} <build-type> <build-directory>"
-	echo "build-type value can be one of:"
-	echo "	`startBold` ${TYPE_ALL}`stopBold` - Sets up the build directoryand then triggers a full build"
-	echo "	`startBold` ${TYPE_SETUP}`stopBold` - Sets up the build directory; doesn't trigger build"
-	echo "	`startBold` ${TYPE_BUILD}`stopBold` - Assumes that build directory is set up and simply triggers the build"
+
+function main()
+{
+    # Parse command line arguments.
+    while getopts :fh OPT; do
+	case "$OPT" in
+	    h)
+		show_help
+		exit 0
+		;;
+	    f)
+		force=yes
+		;;
+	    \?)
+                # getopts issues an error message
+		echo "Invalid option: -$OPTARG"
+		show_help
+		exit 1
+		;;
+	    :)
+		echo "Option -$OPTARG requires an argument."
+		show_help
+		exit 1
+		;;
+	esac
+    done
+
+    # Remove the switches we parsed above.
+    shift `expr $OPTIND - 1`
+
+    # We want only one non-option argument.
+    if [ $# -gt 2 ]; then
+		show_help
+		exit 1
+    fi
+
+    src_dir=$(dirname $(dirname $(readlink -e $0)))
+    parent_dir=$(dirname $src_dir)
+
+    gmc_target_dir=$1
+    build_dir=$2
+
+    if [ -z "$gmc_target_dir" ]; then
+		gmc_target_dir=$parent_dir/gmc-target
+    fi
+
+    if [ -z "$build_dir" ]; then
+		build_dir=$parent_dir/gmc-build
+    fi
+
+    if [ ! -e "$gmc_target_dir" ]; then
+		echo "Getting gmc-target from $GMC_TARGET_URL"
+		git clone $GMC_TARGET_URL $gmc_target_dir
+    fi
+
+    if [ "$force" = "yes" ]; then
+		rm -fr $build_dir
+    fi
+
+    TOOLS_DIR=${build_dir}/tools
+    DIST_BASE=${build_dir}/dist
+    KEYS_DIR=${TOOLS_DIR}/keys
+    BUCKMINSTER_HOME=${TOOLS_DIR}/buckminster
+    WORKSPACE_DIR=${BUCKMINSTER_HOME}/workspace
+    PROPERTIES_FILE=${WORKSPACE_DIR}/build/glustermc_build.properties
+    SCRIPT_DIR=$src_dir/build
+
+    if [ ! -e $build_dir ]; then
+		mkdir -p $build_dir
+		if [ ! -e ${TOOLS_DIR} ]; then
+	    	get_director
+		fi
+		if [ ! -e ${BUCKMINSTER_HOME} ]; then
+	    	install_buckminster
+		fi
+		if [ ! -e ${KEYS_DIR} ]; then
+	    	setup_keys
+		fi
+    fi
+
+    configure_workspace
+    build
+	echo
+	echo "Build artifacts:"
+    showBold "    ${DIST_BASE}/gmg/gmg-installer-$VERSION.tar.gz"
+	showBold "    ${DIST_BASE}/gmg-backend/gmg-backend-installer-$VERSION.tar.gz"
 	echo
-	exit ${USAGE_ERR}
-fi
-
-BUILD_MODE=${1}
-BUCKMINSTER_HOME=${2}
-WORKSPACE_DIR=${BUCKMINSTER_HOME}/workspace
-PROPERTIES_FILE=${WORKSPACE_DIR}/gmc-src/com.gluster.storage.management.releng/glustermc_build.properties
-
-if [ "${BUILD_MODE}" == "${TYPE_ALL}" -o "${BUILD_MODE}" == "${TYPE_SETUP}" ]; then
-	get_director
-	install_buckminster
-fi
-
-if [ "${BUILD_MODE}" == "${TYPE_ALL}" -o "${BUILD_MODE}" == "${TYPE_BUILD}" ]; then
-	configure_workspace
-	build
-fi
+}
+
+main "$@"
diff --git a/build/gmc-checkout.sh b/build/gmc-checkout.sh
deleted file mode 100755
index e7ba352c..00000000
--- a/build/gmc-checkout.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-# cleans the workspace and checks out gmc projects in to it
-
-cd ${WORKSPACE}
-rm -rf gmc-src gmc-target
-git clone /data/private/gmc-src.git
-git clone /data/private/gmc-target.git
diff --git a/build/gmc-gui-buckminster.commands b/build/gmc-gui-buckminster.commands
deleted file mode 100755
index a5d3fa39..00000000
--- a/build/gmc-gui-buckminster.commands
+++ /dev/null
@@ -1,9 +0,0 @@
-# Buckminster commands to build Gluster Management Console projects
-
-importtarget --active src/com.gluster.storage.management.releng/gluster-management-console.target
-
-import src/com.gluster.storage.management.releng/com.gluster.storage.management.console.feature.webstart.cquery
-perform com.gluster.storage.management.console.feature.webstart#create.eclipse.jnlp.product
-perform com.gluster.storage.management.console.feature.webstart#copy.root.files
-perform com.gluster.storage.management.console.feature.webstart#unsign.jars
-perform com.gluster.storage.management.console.feature.webstart#sign.jars
diff --git a/build/gmg-backend-install.sh b/build/gmg-backend-install.sh
new file mode 100755
index 00000000..1dc051e0
--- /dev/null
+++ b/build/gmg-backend-install.sh
@@ -0,0 +1,162 @@
+#!/bin/bash
+
+#------------------------------------------------------------------
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Gateway.
+#
+# Gluster Management Gateway 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.
+#
+# Gluster Management Gateway 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/>.
+#------------------------------------------------------------------
+
+# Variables
+USAGE_ERR=1
+FUSE_ERR=2
+CHKCONFIG_ERR=3
+TAR_ERR=4
+GMGBE_ROOT_DIR="/opt/glustermg"
+
+function quit()
+{
+	echo ${1}
+	echo
+	exit ${2} 
+}
+
+function pre()
+{
+	modprobe -q fuse
+	if ! lsmod | grep -qw fuse; then
+    	quit "fuse kernel module is not found!" ${FUSE_ERR}
+	fi
+
+	if [ ! -f /sbin/chkconfig ]; then
+		quit "/sbin/chkconfig not found!" ${CHKCONFIG_ERR}
+	fi
+
+	if ! which python 1>/dev/null 2>/dev/null; then
+	    quit "python not found" -2
+	fi
+
+	if python -c 'import sys; sys.exit(sys.version_info >= (2,4,0) and sys.version_info < (3,0,0))'; then
+	    python -c 'import sys; print "Python", sys.version'
+	    quit "python version 2.4+ and less than 3.0 is required" -2
+	fi
+
+	if ! which perl 1>/dev/null 2>/dev/null; then
+	    quit "perl not found" -2
+	fi
+
+	if ! perl -MRRDs -e 1 2>/dev/null; then
+	    quit "perl::RRDs not found" -2
+	fi
+
+	if ! which smbd 1>/dev/null 2>/dev/null; then
+	    quit "samba not found" -2
+	fi
+
+	if [ ! -f /usr/lib64/libxml2.so.2 ]; then
+	    quit "libxml2 not found" -2
+	fi
+}
+
+function check_tar_gz()
+{
+    file $GMGBE_ARCHIVE_PATH | grep "gzip" > /dev/null;
+    if [ $? != 0 ] ; then
+		quit "The given filename is not a gunzipped tarball. The file name must be of the form glustermg-backend-version.tar.gz" ${TAR_ERR}
+    fi
+}
+
+function get_gmg_version()
+{
+	# Format is /path/to/glustermg-backend-version.tar.gz
+	# Remove prefix
+	PART1=${GMGBE_ARCHIVE_PATH#*glustermg-backend-}
+	# Remove suffix
+	GMG_VERSION=${PART1%.tar.gz}
+
+	GMGBE_DIR="${GMGBE_ROOT_DIR}/${GMG_VERSION}/backend";
+}
+
+function make_dirs()
+{
+    mkdir -p $GMGBE_DIR /var/lib/rrd
+}
+
+function extract_archive()
+{
+	tar xvfz ${GMGBE_ARCHIVE_PATH}
+
+	# The tar contains files in path glustermg-backend-version/gmg-scripts/*.py
+	SRC_DIR=glustermg-backend-${GMG_VERSION}
+	mv ${SRC_DIR}/gmg-scripts/* ${GMGBE_DIR}
+	rm -rf ${SRC_DIR}
+}
+
+function create_links()
+{
+	ln -fs ${GMGBE_DIR}/multicast-discoverd.py /usr/sbin/multicast-discoverd
+	ln -fs ${GMGBE_DIR}/gluster_cifs_volume_startup.py /usr/sbin/gluster_cifs_volume_startup
+	ln -fs ${GMGBE_DIR}/multicast-discoverd.init.d /etc/init.d/multicast-discoverd
+	ln -fs ${GMGBE_DIR}/gluster-volume-settings.init.d /etc/init.d/gluster-volume-settings
+}
+
+function post()
+{
+	if [ -f /etc/sudoers ]; then
+		chmod 644 /etc/sudoers
+		sed -i '/^Defaults.*requiretty/d' /etc/sudoers
+		chmod 0440 /etc/sudoers
+	fi
+
+	if ! grep -q rrd_cpu.pl /etc/crontab; then
+		echo "*/5 * * * * root /opt/glustermg/${GMG_VERSION}/backend/rrd_cpu.pl" >> /etc/crontab
+	fi
+	if ! grep -q rrd_mem.pl /etc/crontab; then
+		echo "*/5 * * * * root /opt/glustermg/${GMG_VERSION}/backend/rrd_mem.pl" >> /etc/crontab
+	fi
+	if ! grep -q rrd_net.pl /etc/crontab; then
+		echo "*/5 * * * * root /opt/glustermg/${GMG_VERSION}/backend/rrd_net.pl" >> /etc/crontab
+	fi
+	/sbin/chkconfig --add multicast-discoverd
+	/sbin/chkconfig --level 345 multicast-discoverd on
+	if /etc/init.d/multicast-discoverd status >/dev/null; then
+		/etc/init.d/multicast-discoverd restart
+	else
+		/etc/init.d/multicast-discoverd start
+	fi
+	/etc/init.d/crond reload
+	/sbin/chkconfig smb on
+	/sbin/chkconfig --add gluster-volume-settings
+}
+
+#-----------------------------------
+# Main Action Body
+#-----------------------------------
+
+if [ $# -ne 1 ]; then
+	quit "Usage: $0 <path to glustermg-backend-version.tar.gz>" ${USAGE_ERR}
+fi
+
+GMGBE_ARCHIVE_PATH=${1}
+
+pre
+check_tar_gz
+get_gmg_version
+
+make_dirs
+extract_archive
+create_links
+post
+
diff --git a/build/gmg-buckminster.commands b/build/gmg-buckminster.commands
index 96175b57..d617bf62 100755
--- a/build/gmg-buckminster.commands
+++ b/build/gmg-buckminster.commands
@@ -1,11 +1,28 @@
-# Buckminster commands to build Gluster Management Console projects
+#------------------------------------------------------------------
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Gateway.
+#
+# Gluster Management Gateway 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.
+#
+# Gluster Management Gateway 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/>.
+#------------------------------------------------------------------
 
-importtarget --active src/com.gluster.storage.management.releng/gluster-management-console.target
+# Buckminster commands to build Gluster Management Gateway
 
-import src/com.gluster.storage.management.releng/com.gluster.storage.management.core.cquery
-#import src/com.gluster.storage.management.releng/com.gluster.storage.management.client.cquery
-import src/com.gluster.storage.management.releng/com.gluster.storage.management.gateway.cquery
+importtarget --active gmc-target/org.gluster.storage.management.console.target/gmc.target
 
-perform com.gluster.storage.management.core#bundle.jar
-#perform com.gluster.storage.management.client#bundle.jar
-perform com.gluster.storage.management.gateway#archive
+import build/org.gluster.storage.management.core.cquery
+import build/org.gluster.storage.management.gateway.cquery
+
+perform org.gluster.storage.management.core#bundle.jar
+perform org.gluster.storage.management.gateway#archive
diff --git a/build/gmg-install.sh b/build/gmg-install.sh
new file mode 100755
index 00000000..58491f5c
--- /dev/null
+++ b/build/gmg-install.sh
@@ -0,0 +1,196 @@
+#!/bin/bash
+
+#------------------------------------------------------------------
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Gateway.
+#
+# Gluster Management Gateway 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.
+#
+# Gluster Management Gateway 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/>.
+#------------------------------------------------------------------
+
+# Variables
+GMG_LOG_DIR="/var/log/glustermg";
+GMG_ROOT_DIR="/opt/glustermg"
+GMG_KEYS_DIR="${GMG_ROOT_DIR}/keys"
+GMG_ETC_DIR="${GMG_ROOT_DIR}/etc"
+USAGE_ERR=1
+TOMCAT_ERR=2
+JAVA_ERR=3
+TAR_ERR=4
+
+function quit()
+{
+	echo ${1}
+	echo
+	exit ${2} 
+} 
+
+function post_install()
+{
+    if [ ! -f /etc/init.d/$TOMCAT_BIN ]; then
+		echo "All operations completed. Please restart tomcat."
+    else
+		echo "Re-starting [${TOMCAT_BIN}].."
+		service $TOMCAT_BIN restart;
+    fi
+	echo
+}
+
+function create_links()
+{
+	if [ -f ${WEBAPPS_DIR}/glustermg ]; then
+    	rm -f ${WEBAPPS_DIR}/glustermg
+	fi
+	ln -fs ${GMG_HOME_DIR}/glustermg ${WEBAPPS_DIR}
+
+	GMG_SCRIPTS_DIR="${GMG_HOME_DIR}/glustermg/scripts"
+    ln -sf ${GMG_SCRIPTS_DIR}/grun.py /usr/bin/grun.py
+    ln -sf ${GMG_SCRIPTS_DIR}/add_user_cifs_all.py /usr/sbin/add_user_cifs_all.py
+    ln -sf ${GMG_SCRIPTS_DIR}/delete_user_cifs_all.py /usr/sbin/delete_user_cifs_all.py
+    ln -sf ${GMG_SCRIPTS_DIR}/setup_cifs_config_all.py /usr/sbin/setup_cifs_config_all.py
+    ln -sf ${GMG_SCRIPTS_DIR}/gmg-reset-password.sh /usr/sbin/gmg-reset-password.sh
+}
+
+# Update tomcat sysconfig file with java options
+function set_java_options()
+{
+	TOMCAT_CONFIG_FILE="/etc/sysconfig/$TOMCAT_BIN"
+	if [ -f ${TOMCAT_CONFIG_FILE} ]; then
+    	if ! grep -q '^JAVA_HOME="/usr/lib/jvm/jre-1.6.0-openjdk.x86_64"' ${TOMCAT_CONFIG_FILE}; then
+			sed -i 's/^JAVA_HOME=/# JAVA_HOME=/g' ${TOMCAT_CONFIG_FILE}
+			echo 'JAVA_HOME="/usr/lib/jvm/jre-1.6.0-openjdk.x86_64"' >> ${TOMCAT_CONFIG_FILE}
+    	fi
+	
+    	if ! grep -q '# Added by Gluster: JAVA_OPTS="${JAVA_OPTS} -Xms1024m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m"' ${TOMCAT_CONFIG_FILE}; then
+			echo '# Added by Gluster: JAVA_OPTS="${JAVA_OPTS} -Xms1024m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m"' >> ${TOMCAT_CONFIG_FILE}
+			echo 'JAVA_OPTS="${JAVA_OPTS} -Xms1024m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m"' >> ${TOMCAT_CONFIG_FILE}
+    	fi
+	fi
+}
+
+function configure_ssl()
+{
+	TOMCAT_SERVER_CONFIG_FILE=${TOMCAT_DIR}/conf/server.xml
+	SSL_KEYSTORE_FILE=${WEBAPPS_DIR}/glustermg/ssl/gmg-ssl.keystore
+    if ! grep -q ${SSL_KEYSTORE_FILE} ${TOMCAT_SERVER_CONFIG_FILE}; then
+		sed -i '/<\/Service>/i \
+    	<Connector SSLEnabled="true" \
+               clientAuth="false" \
+               executor="tomcatThreadPool" \
+               maxThreads="150" \
+               port="8443" \
+               keystoreFile="$TOMCAT_DIR/webapps/glustermg/ssl/gmg-ssl.keystore" \
+               keystorePass="gluster" \
+               protocol="org.apache.coyote.http11.Http11Protocol" \
+               scheme="https" \
+               secure="true" \
+               sslProtocol="TLS" />' ${TOMCAT_SERVER_CONFIG_FILE}
+		sed -i "s,keystoreFile=\"\$TOMCAT_DIR/webapps/glustermg/ssl/gmg-ssl.keystore\",keystoreFile=\"${SSL_KEYSTORE_FILE}\"," ${TOMCAT_SERVER_CONFIG_FILE}
+    fi
+}
+
+function enable_proxy_caching()
+{
+    if ! grep -q "org.apache.catalina.authenticator.NonLoginAuthenticator" $TOMCAT_DIR/conf/context.xml; then
+		sed -i '/<\/Context>/i \
+    	<Valve className="org.apache.catalina.authenticator.NonLoginAuthenticator" \
+           	disableProxyCaching="false" />' $TOMCAT_DIR/conf/context.xml
+    fi
+}
+
+function configure_server()
+{
+	set_java_options
+	configure_ssl
+	enable_proxy_caching	
+}
+
+function make_dirs()
+{
+    mkdir -p $GMG_HOME_DIR $GMG_KEYS_DIR $GMG_ETC_DIR $GMG_LOG_DIR
+    if [ ! -f ${GMG_KEYS_DIR}/gluster.pem ]; then
+		ssh-keygen -t rsa -f /opt/glustermg/keys/gluster.pem -N ''
+		mv -f /opt/glustermg/keys/gluster.pem.pub /opt/glustermg/keys/gluster.pub
+    fi
+    chown -R tomcat:tomcat $GMG_ROOT_DIR $GMG_LOG_DIR;
+}
+
+function check_tar_gz()
+{
+    file $GMG_ARCHIVE_PATH | grep "gzip" > /dev/null;
+    if [ $? != 0 ] ; then
+		quit "The given filename is not a gunzipped tarball. The file name must be of the form glustermg-version.war.tar.gz" ${TAR_ERR}
+    fi
+}
+
+function get_gmg_version()
+{
+	# Format is /path/to/glustermg-version.war.tar.gz
+	# Remove prefix
+	PART1=${GMG_ARCHIVE_PATH#*glustermg-}
+	# Remove suffix
+	GMG_VERSION=${PART1%.war.tar.gz}
+
+	GMG_HOME_DIR="${GMG_ROOT_DIR}/${GMG_VERSION}";
+}
+
+function check_tomcat_dir()
+{
+	WEBAPPS_DIR="${TOMCAT_DIR}/webapps"
+    if [ ! -d "${WEBAPPS_DIR}" ]; then
+		quit "There is no webapps directory in [${TOMCAT_DIR}]." ${TOMCAT_ERR}
+    fi
+    TOMCAT_BIN=$(basename /usr/sbin/tomcat* );
+}
+
+function check_java_version()
+{
+	java -version 2>/dev/null || quit "java command not available. Please make sure that Java >=1.6.0 is installed and is present in \$PATH" ${JAVA_ERR}
+	JAVA_VERSION=`java -version 2>&1 |awk 'NR==1{ gsub(/"/,""); gsub(/_.*/, ""); print $3 }'`
+	MINVERSION=1.6
+
+	if expr ${JAVA_VERSION} \>= ${MINVERSION} > /dev/null; then
+		echo "Found java version [${JAVA_VERSION}]"
+	else
+		quit "Java minimum version expected [${MINVERSION}], found [${JAVA_VERSION}]!" ${JAVA_ERR}
+	fi
+}
+
+function install_gmg()
+{
+	tar -xvf ${GMG_ARCHIVE_PATH} -C ${GMG_HOME_DIR}
+	create_links
+}
+
+#-----------------------------------
+# Main Action Body
+#-----------------------------------
+
+if [ "x$1" == "x" ] || [ "x$1$2" == "x$1" ] || [ $# -gt 2 ]; then
+	quit "Usage: $0 <path to glustermg-version.war.tar.gz> <path to tomcat directory>" ${USAGE_ERR}
+fi
+
+GMG_ARCHIVE_PATH="$1";
+TOMCAT_DIR="$2";
+
+check_tomcat_dir
+check_java_version
+check_tar_gz
+get_gmg_version
+
+make_dirs
+install_gmg
+
+configure_server
+post_install
diff --git a/build/junit-buckminster.commands b/build/junit-buckminster.commands
index 1d1a7efd..7a0d260b 100755
--- a/build/junit-buckminster.commands
+++ b/build/junit-buckminster.commands
@@ -1,5 +1,26 @@
-importtarget --active src/com.gluster.storage.management.releng/gluster-management-console.target
+#------------------------------------------------------------------
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Console.
+#
+# Gluster Management Console 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.
+#
+# Gluster Management Console 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/>.
+#------------------------------------------------------------------
 
-import src/com.gluster.storage.management.releng/com.gluster.storage.management.core.cquery
-perform com.gluster.storage.management.core#java.binaries
-junit -o test-reports/core.xml -l /com.gluster.storage.management.core/junit/core.junit.launch
+# Buckminster commands for JUnit test run
+importtarget --active gmc-target/org.gluster.storage.management.console.target/gmc.target
+
+import build/org.gluster.storage.management.core.cquery
+perform org.gluster.storage.management.core#java.binaries
+
+junit -o test-reports/core.xml -l /org.gluster.storage.management.core/junit/core.junit.launch
diff --git a/src/com.gluster.storage.management.releng/com.gluster.storage.management.console.feature.webstart.cquery b/build/org.gluster.storage.management.console.feature.webstart.cquery
index ffd8dec8..6def1167 100644
--- a/src/com.gluster.storage.management.releng/com.gluster.storage.management.console.feature.webstart.cquery
+++ b/build/org.gluster.storage.management.console.feature.webstart.cquery
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="glustermc.rmap">
-    <cq:rootRequest name="com.gluster.storage.management.console.feature.webstart" componentType="eclipse.feature"/>
+    <cq:rootRequest name="org.gluster.storage.management.console.feature.webstart" componentType="eclipse.feature"/>
 </cq:componentQuery>
diff --git a/src/com.gluster.storage.management.releng/com.gluster.storage.management.core.cquery b/build/org.gluster.storage.management.core.cquery
index a97d350d..6744781e 100644
--- a/src/com.gluster.storage.management.releng/com.gluster.storage.management.core.cquery
+++ b/build/org.gluster.storage.management.core.cquery
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="glustermc.rmap">
-    <cq:rootRequest name="com.gluster.storage.management.client" componentType="osgi.bundle"/>
+    <cq:rootRequest name="org.gluster.storage.management.client" componentType="osgi.bundle"/>
 </cq:componentQuery>
diff --git a/src/com.gluster.storage.management.releng/com.gluster.storage.management.gateway.cquery b/build/org.gluster.storage.management.gateway.cquery
index 1f663cbe..e032b467 100644
--- a/src/com.gluster.storage.management.releng/com.gluster.storage.management.gateway.cquery
+++ b/build/org.gluster.storage.management.gateway.cquery
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="glustermc.rmap">
-    <cq:rootRequest name="com.gluster.storage.management.gateway" componentType="unknown"/>
+    <cq:rootRequest name="org.gluster.storage.management.gateway" componentType="unknown"/>
 </cq:componentQuery>
diff --git a/build/package-backend.sh b/build/package-backend.sh
index 03664381..a207083b 100755
--- a/build/package-backend.sh
+++ b/build/package-backend.sh
@@ -1,6 +1,29 @@
+#!/bin/bash
+
+#------------------------------------------------------------------
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Gateway.
+# 
+# Gluster Management Gateway 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.
+# 
+# Gluster Management Gateway 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/>.
+#------------------------------------------------------------------
+
 ROOT_DIR=glustermg-backend-${VERSION}
 DIR_NAME=${ROOT_DIR}/gmg-scripts
 TAR_NAME=${ROOT_DIR}.tar
+INSTALL_SCRIPT_NAME=gmg-backend-install.sh
+INSTALLER_TAR_NAME=gmg-backend-installer-${VERSION}.tar
 
 prepare-script-dir()
 {
@@ -13,8 +36,8 @@ prepare-script-dir()
 get-scripts()
 {
 	cd ${DIR_NAME}
-	cp ../../src/com.gluster.storage.management.gateway.scripts/src/common/* .
-	cp ../../src/com.gluster.storage.management.gateway.scripts/src/backend/* .
+	cp ../../src/org.gluster.storage.management.gateway.scripts/src/common/* .
+	cp ../../src/org.gluster.storage.management.gateway.scripts/src/backend/* .
 	chmod +x *
 	cd -
 }
@@ -22,13 +45,22 @@ get-scripts()
 #---------------------------------------------
 # Main Action Body
 #---------------------------------------------
+if [ $? -eq 1 ]; then
+	DIST_DIR=${1}
+fi
 echo "Packaging Gluster Management Gateway Back-end Scripts..."
 
 prepare-script-dir
 get-scripts
 
 /bin/rm -rf ${TAR_NAME} ${TAR_NAME}.gz
-tar cvf ${TAR_NAME} ${ROOT_DIR}
-gzip ${TAR_NAME}
+tar cvfz ${TAR_NAME}.gz ${ROOT_DIR}
+cp build/${INSTALL_SCRIPT_NAME} .
+tar cvfz ${INSTALLER_TAR_NAME}.gz ${TAR_NAME}.gz ${INSTALL_SCRIPT_NAME}
+
+if [ ! -z "${DIST_DIR}" ]; then
+	mv ${INSTALLER_TAR_NAME}.gz ${DIST_DIR}
+fi
+/bin/rm -rf ${ROOT_DIR}
 
 echo "Done!"
diff --git a/build/package-gateway.sh b/build/package-gateway.sh
index 6dc1e9db..c6bbce8c 100755
--- a/build/package-gateway.sh
+++ b/build/package-gateway.sh
@@ -1,8 +1,31 @@
+#!/bin/bash
+
+#------------------------------------------------------------------
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Gateway.
+#
+# Gluster Management Gateway 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.
+#
+# Gluster Management Gateway 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/>.
+#------------------------------------------------------------------
+
 WAR_NAME="glustermg.war"
 WAR_SCRIPTS_DIR=${WAR_NAME}/scripts
 NEW_WAR_NAME="glustermg"
+VERSION=${VERSION:-1.0.0alpha}
 TAR_NAME=${NEW_WAR_NAME}-${VERSION}.war.tar
-SERVER_DIST_DIR="${WORKSPACE}/buckminster.output"
+INSTALL_SCRIPT_NAME=gmg-install.sh
+INSTALLER_TAR_NAME=gmg-installer-${VERSION}.tar
 
 prepare-dist-dir()
 {
@@ -20,6 +43,10 @@ get-server-war()
 	cd ${WAR_NAME}
 	WAR_FILE=`find -L ${SERVER_DIST_DIR} -name ${WAR_NAME}`
 	jar xvf ${WAR_FILE}
+
+	# Update version number in Utils.py
+	sed -i "s/@VERSION@/${VERSION}/g" scripts/Utils.py
+
 	chmod +x scripts/*
 	cd -
 }
@@ -48,34 +75,45 @@ get-dist()
 	OS=${2}
 	WS=${3}
 
-	OUT_DIR="${WORKSPACE}/../../${BRANCH}-glustermc/workspace/arch/${ARCH}/os/${OS}/ws/${WS}/buckminster.output/com.gluster.storage.management.console.feature.webstart*.feature/glustermc"
+	if [ -z "${GMC_DIST_DIR}" ]; then
+		OUT_DIR="${WORKSPACE}/../../${BRANCH}-glustermc/workspace/arch/${ARCH}/os/${OS}/ws/${WS}/buckminster.output/org.gluster.storage.management.console.feature.webstart*.feature/glustermc"
+	else
+		OUT_DIR="${GMC_DIST_DIR}/${OS}.${WS}.${ARCH}/org.gluster.storage.management.console.feature.webstart*.feature/glustermc"
+	fi
 	NEW_DIR=${WAR_NAME}/${OS}.${WS}.${ARCH}
 	cp -R ${OUT_DIR} ${NEW_DIR}
 
-	update-jnlp ${ARCH} ${NEW_DIR}/com.gluster.storage.management.console.feature_*.jnlp
+	update-jnlp ${ARCH} ${NEW_DIR}/org.gluster.storage.management.console.feature_*.jnlp
 }
 
 get-console-dists()
 {
-	get-dist x86 win32 win32
-	get-dist x86_64 win32 win32
 	get-dist x86 linux gtk
 	get-dist x86_64 linux gtk
+	get-dist x86 win32 win32
+	get-dist x86_64 win32 win32
 	get-dist x86 macosx cocoa
 	get-dist x86_64 macosx cocoa
 }
 
 get-scripts()
 {
-	cp src/com.gluster.storage.management.gateway.scripts/src/common/* ${WAR_SCRIPTS_DIR}
-	cp src/com.gluster.storage.management.gateway.scripts/src/gateway/* ${WAR_SCRIPTS_DIR}
+	cp src/org.gluster.storage.management.gateway.scripts/src/common/* ${WAR_SCRIPTS_DIR}
+	cp src/org.gluster.storage.management.gateway.scripts/src/gateway/* ${WAR_SCRIPTS_DIR}
 	chmod +x ${WAR_SCRIPTS_DIR}/*
 }
 
 #---------------------------------------------
 # Main Action Body
 #---------------------------------------------
-echo "Packaging Gluster Management Server..."
+
+if [ $# -eq 2 ]; then
+	DIST_DIR=${1}
+	GMC_DIST_DIR=${2}
+fi
+SERVER_DIST_DIR=${DIST_DIR:-${WORKSPACE}/buckminster.output}
+
+echo "Packaging Gluster Management Gateway..."
 
 prepare-dist-dir
 get-scripts
@@ -84,7 +122,13 @@ get-console-dists
 
 /bin/mv -f ${WAR_NAME} ${NEW_WAR_NAME}
 /bin/rm -rf ${TAR_NAME} ${TAR_NAME}.gz
-tar cvf ${TAR_NAME} ${NEW_WAR_NAME}
-gzip ${TAR_NAME}
+tar cvfz ${TAR_NAME}.gz ${NEW_WAR_NAME}
+cp build/${INSTALL_SCRIPT_NAME} .
+
+tar cvfz ${INSTALLER_TAR_NAME}.gz ${TAR_NAME}.gz ${INSTALL_SCRIPT_NAME}
+
+if [ ! -z "${DIST_DIR}" ]; then
+	mv ${INSTALLER_TAR_NAME}.gz ${DIST_DIR}
+fi
 
 echo "Done!"
diff --git a/rfc.sh b/rfc.sh
new file mode 100755
index 00000000..e6cce0d2
--- /dev/null
+++ b/rfc.sh
@@ -0,0 +1,111 @@
+#!/bin/sh -e
+
+
+branch="master";
+
+
+set_hooks_commit_msg()
+{
+    f=".git/hooks/commit-msg";
+    u="http://review.gluster.com/tools/hooks/commit-msg";
+
+    if [ -x "$f" ]; then
+        return;
+    fi
+
+    curl -o $f $u || wget -O $f $u;
+
+    chmod +x .git/hooks/commit-msg;
+}
+
+
+is_num()
+{
+    local num;
+
+    num="$1";
+
+    [ -z "$(echo $num | sed -e 's/[0-9]//g')" ]
+}
+
+
+rebase_changes()
+{
+    git fetch;
+
+    GIT_EDITOR=$0 git rebase -i origin/$branch;
+}
+
+
+editor_mode()
+{
+    if [ $(basename "$1") = "git-rebase-todo" ]; then
+        sed 's/^pick /reword /g' "$1" > $1.new && mv $1.new $1;
+        return;
+    fi
+
+    if [ $(basename "$1") = "COMMIT_EDITMSG" ]; then
+        if grep -qi '^BUG: ' $1; then
+            return;
+        fi
+        while true; do
+            echo Commit: "\"$(head -n 1 $1)\""
+            echo -n "Enter Bug ID: "
+            read bug
+            if [ -z "$bug" ]; then
+                return;
+            fi
+            if ! is_num "$bug"; then
+                echo "Invalid Bug ID ($bug)!!!";
+                continue;
+            fi
+
+            sed "/^Change-Id:/{p; s/^.*$/BUG: $bug/;}" $1 > $1.new && \
+                mv $1.new $1;
+            return;
+        done
+    fi
+
+    cat <<EOF
+$0 - editor_mode called on unrecognized file $1 with content:
+$(cat $1)
+EOF
+    return 1;
+}
+
+
+assert_diverge()
+{
+    git diff origin/$branch..HEAD | grep -q .;
+}
+
+
+main()
+{
+    if [ -e "$1" ]; then
+        editor_mode "$@";
+        return;
+    fi
+
+    set_hooks_commit_msg;
+
+    rebase_changes;
+
+    assert_diverge;
+
+    bug=$(git show --format='%b' | grep -i '^BUG: ' | awk '{print $2}');
+
+    if [ "$DRY_RUN" = 1 ]; then
+        drier='echo -e Please use the following command to send your commits to review:\n\n'
+    else
+        drier=
+    fi
+
+    if [ -z "$bug" ]; then
+        $drier git push origin HEAD:refs/for/$branch/rfc;
+    else
+        $drier git push origin HEAD:refs/for/$branch/bug-$bug;
+    fi
+}
+
+main "$@"
diff --git a/src/com.gluster.storage.management.client/build.properties b/src/com.gluster.storage.management.client/build.properties
deleted file mode 100644
index bc0c59d7..00000000
--- a/src/com.gluster.storage.management.client/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = .,\
-               META-INF/,\
-               lib/,\
-               keystore/,\
-               lib/jersey-1.5/jersey-multipart-1.5.jar
-src.includes = src/,\
-               lib/,\
-               keystore/,\
-               build.properties,\
-               .project,\
-               .classpath,\
-               .settings/,\
-               META-INF/
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/constants/ClientConstants.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/constants/ClientConstants.java
deleted file mode 100644
index e253dfa5..00000000
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/constants/ClientConstants.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * ClientConstants.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
- *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.client.constants;
-
-/**
- *
- */
-public class ClientConstants {
-	public static final String SYS_PROP_SERVER_URL = "gluster.server.url";
-	public static final String DEFAULT_SERVER_URL = "https://localhost:8443/glustermg/linux.gtk.x86_64";
-	public static final String CONTEXT_ROOT = "glustermg";
-	public static final String REST_API_VERSION = "1.0.0";
-	
-	// SSL related
-	public static final String TRUSTED_KEYSTORE = "gmc-trusted.keystore"; 
-	public static final String TRUSTED_KEYSTORE_ACCESS = "gluster";
-	public static final String PROTOCOL_TLS = "TLS";
-	public static final String ALGORITHM_SUNX509 = "SunX509";
-	public static final String KEYSTORE_TYPE_JKS = "JKS";
-}
-
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/utils/ClientUtil.java b/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/utils/ClientUtil.java
deleted file mode 100644
index 3f87fd27..00000000
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/utils/ClientUtil.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.gluster.storage.management.client.utils;
-
-import java.net.URI;
-
-import javax.ws.rs.core.UriBuilder;
-
-import com.gluster.storage.management.client.constants.ClientConstants;
-
-public class ClientUtil {
-
-	public static URI getServerBaseURI() {
-		return UriBuilder.fromUri(getBaseURL()).path(ClientConstants.REST_API_VERSION).build();
-	}
-	
-	private static String getBaseURL() {
-		// remove the platform path (e.g. /linux.gtk.x86_64) from the URL
-		return System.getProperty(ClientConstants.SYS_PROP_SERVER_URL, ClientConstants.DEFAULT_SERVER_URL)
-				.replaceAll(ClientConstants.CONTEXT_ROOT + "\\/.*", ClientConstants.CONTEXT_ROOT + "\\/");
-	}
-}
diff --git a/src/com.gluster.storage.management.console.feature.webstart/build.properties b/src/com.gluster.storage.management.console.feature.webstart/build.properties
deleted file mode 100644
index 322a3114..00000000
--- a/src/com.gluster.storage.management.console.feature.webstart/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#bin.includes = feature.xml
-root=rootfiles
diff --git a/src/com.gluster.storage.management.console.feature.webstart/build/gluster.keystore b/src/com.gluster.storage.management.console.feature.webstart/build/gluster.keystore
deleted file mode 100644
index ee3bc3a9..00000000
--- a/src/com.gluster.storage.management.console.feature.webstart/build/gluster.keystore
+++ /dev/null
diff --git a/src/com.gluster.storage.management.console.feature/.project b/src/com.gluster.storage.management.console.feature/.project
deleted file mode 100644
index a736d116..00000000
--- a/src/com.gluster.storage.management.console.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>com.gluster.storage.management.console.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/src/com.gluster.storage.management.console.feature/build.properties b/src/com.gluster.storage.management.console.feature/build.properties
deleted file mode 100644
index 64f93a9f..00000000
--- a/src/com.gluster.storage.management.console.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/src/com.gluster.storage.management.console.help/build.properties b/src/com.gluster.storage.management.console.help/build.properties
deleted file mode 100644
index 9fb97e12..00000000
--- a/src/com.gluster.storage.management.console.help/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = plugin.xml,\
-               META-INF/,\
-               html/,\
-               toc.xml,\
-               tocconcepts.xml,\
-               tocgettingstarted.xml,\
-               toctasks.xml,\
-               tocreference.xml
diff --git a/src/com.gluster.storage.management.console.help/plugin.xml b/src/com.gluster.storage.management.console.help/plugin.xml
deleted file mode 100644
index 13c39574..00000000
--- a/src/com.gluster.storage.management.console.help/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.help.toc">
-      <toc
-            file="toc.xml"
-            primary="true">
-      </toc>
-      <toc
-            file="tocconcepts.xml">
-      </toc>
-      <toc
-            file="tocgettingstarted.xml">
-      </toc>
-      <toc
-            file="tocreference.xml">
-      </toc>
-      <toc
-            file="toctasks.xml"
-            primary="true">
-      </toc>
-   </extension>
-
-</plugin>
diff --git a/src/com.gluster.storage.management.console.help/toc.xml b/src/com.gluster.storage.management.console.help/toc.xml
deleted file mode 100644
index 99a3ff5c..00000000
--- a/src/com.gluster.storage.management.console.help/toc.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Gluster Management Console - Help" topic="html/toc.html">
-   <topic label="Concepts">
-      <anchor id="concepts"/>
-   </topic>
-   <topic label="Getting Started">
-      <anchor id="gettingstarted"/>
-   </topic>
-   <topic label="Tasks">
-      <anchor id="tasks"/>
-   </topic>
-</toc>
diff --git a/src/com.gluster.storage.management.console.help/tocconcepts.xml b/src/com.gluster.storage.management.console.help/tocconcepts.xml
deleted file mode 100644
index 23a9c2a0..00000000
--- a/src/com.gluster.storage.management.console.help/tocconcepts.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Concepts" link_to="toc.xml#concepts">
-	<topic label="Gluster FileSystem"  href="html/concepts/gluster_fs.html">
-	<topic label="Common Cluster Terminologies"  href="html/concepts/common_terms.html" /> 
-	</topic>
- <topic href="html/concepts/about_gmg.html" label="About Gluster Management Gateway">
- </topic> 
-	<topic label="About Gluster Management Console"  href="html/concepts/about_gmc.html"> 
-	</topic> 
-</toc>
diff --git a/src/com.gluster.storage.management.console.help/tocreference.xml b/src/com.gluster.storage.management.console.help/tocreference.xml
deleted file mode 100644
index 660cdecc..00000000
--- a/src/com.gluster.storage.management.console.help/tocreference.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Reference" link_to="toc.xml#reference"> 
-	<topic label="Main Topic"  href="html/reference/maintopic.html"> 
-		<topic label="Sub Topic" href="html/reference/subtopic.html" /> 
-	</topic>
-	<topic label="Main Topic 2">
-		<topic label="Sub Topic 2" href="html/reference/subtopic2.html" /> 
-	</topic> 
-</toc>
diff --git a/src/com.gluster.storage.management.console/build.properties b/src/com.gluster.storage.management.console/build.properties
deleted file mode 100644
index 45eac8b1..00000000
--- a/src/com.gluster.storage.management.console/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               icons/,\
-               product_lg.gif,\
-               splash.bmp,\
-               splash/,\
-               images/,\
-               plugin.xml,\
-               preferences.ini,\
-               plugin.properties
-src.includes = icons/,\
-               splash.bmp,\
-               images/,\
-               preferences.ini,\
-               build.properties,\
-               splash/,\
-               src/
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/offline-brick.png b/src/com.gluster.storage.management.console/icons/tango/22x22/offline-brick.png
deleted file mode 100644
index 57694d4b..00000000
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/offline-brick.png
+++ /dev/null
diff --git a/src/com.gluster.storage.management.console/plugin.properties b/src/com.gluster.storage.management.console/plugin.properties
deleted file mode 100644
index 5393818f..00000000
--- a/src/com.gluster.storage.management.console/plugin.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-aboutText=Gluster Management Console\n\
-Version: 1.0.0\n\n\
-Copyright (c) 2011 Gluster, Inc.\n\
-Visit http://www.gluster.com/\n\n\
-This product includes software developed by the\n\
-Eclipse Foundation http://eclipse.org/\n\
-RichClientGUI http://www.richclientgui.com/
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.console/preferences.ini b/src/com.gluster.storage.management.console/preferences.ini
deleted file mode 100644
index 7053b209..00000000
--- a/src/com.gluster.storage.management.console/preferences.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-org.eclipse.ui/KEY_CONFIGURATION_ID = com.gluster.storage.management.console.KeyConfig
-org.eclipse.help.base/help_home=/com.gluster.storage.management.console.help/html/help_home.html
-IWorkbenchPreferenceConstants.SHOW_PROGRESS_ON_STARTUP=true
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ICommandIds.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ICommandIds.java
deleted file mode 100644
index 36cfd9dc..00000000
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ICommandIds.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
- *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- *******************************************************************************/
-package com.gluster.storage.management.console;
-
-/**
- * Interface defining the application's command IDs.
- * Key bindings can be defined for specific commands.
- * To associate an action with a command, use IAction.setActionDefinitionId(commandId).
- *
- * @see org.eclipse.jface.action.IAction#setActionDefinitionId(String)
- */
-public interface ICommandIds {
-
-    public static final String CMD_OPEN = "com.gluster.storage.management.console.open";
-    public static final String CMD_OPEN_MESSAGE = "com.gluster.storage.management.console.openMessage";
-    
-}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ActionConstants.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ActionConstants.java
deleted file mode 100644
index a1b70ad0..00000000
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ActionConstants.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
- *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- *******************************************************************************/
-package com.gluster.storage.management.console.actions;
-
-public class ActionConstants {
-	public static final String ACTION_SET_CLUSTER = "com.gluster.storage.management.console.actionsets.gluster";
-	public static final String ACTION_SET_VOLUMES = "com.gluster.storage.management.console.actionsets.volumes";
-	public static final String ACTION_SET_VOLUME = "com.gluster.storage.management.console.actionsets.volume";
-	public static final String ACTION_SET_DISKS = "com.gluster.storage.management.console.actionsets.disks";
-	public static final String ACTION_SET_DISK = "com.gluster.storage.management.console.actionsets.disk";
-	public static final String ACTION_SET_GLUSTER_SERVERS = "com.gluster.storage.management.console.actionsets.glusterservers";
-	public static final String ACTION_SET_GLUSTER_SERVER = "com.gluster.storage.management.console.actionsets.glusterserver";
-	public static final String ACTION_SET_DISCOVERED_SERVERS = "com.gluster.storage.management.console.actionsets.serversdiscovered";
-	public static final String ACTION_SET_DISCOVERED_SERVER = "com.gluster.storage.management.console.actionsets.serverdiscovered";
-	public static final String ACTION_SET_TASK = "com.gluster.storage.management.console.actionsets.task";
-	public static final String ACTION_SET_EDIT = "com.gluster.storage.management.console.actionsets.edit";
-	
-	public static final String COMMAND_CREATE_VOLUME = "com.gluster.storage.management.console.commands.CreateVolume";
-	public static final String COMMAND_ADD_SERVER = "com.gluster.storage.management.console.commands.AddServer";
-}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ChangePasswordAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ChangePasswordAction.java
deleted file mode 100644
index a06f13b4..00000000
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ChangePasswordAction.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.gluster.storage.management.console.actions;
-
-import org.eclipse.jface.action.IAction;
-
-import com.gluster.storage.management.console.dialogs.ChangePasswordDialog;
-
-public class ChangePasswordAction extends AbstractActionDelegate {
-
-	@Override
-	protected void performAction(IAction action) {
-		try {
-			// To open a dialog for change password
-			ChangePasswordDialog dialog = new ChangePasswordDialog(getShell());
-			dialog.open();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-	
-	@Override
-	public void dispose() {
-	}
-}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ClearTaskAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ClearTaskAction.java
deleted file mode 100644
index 7cb9a873..00000000
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ClearTaskAction.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.gluster.storage.management.console.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-
-import com.gluster.storage.management.client.TasksClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-
-public class ClearTaskAction extends AbstractActionDelegate {
-	private TaskInfo taskInfo;
-	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
-
-	@Override
-	protected void performAction(final IAction action) {
-		final String actionDesc = action.getDescription();
-
-		try {
-			new TasksClient().deleteTask(taskInfo.getName()); // taskId
-			modelManager.removeTask(taskInfo);
-			action.setEnabled(false); // TODO disable other task buttons
-		} catch (Exception e) {
-			showErrorDialog(actionDesc,
-					"Task [" + taskInfo.getName() + "] could not be cleared! Error: [" + e.getMessage() + "]");
-		}
-	}
-
-	@Override
-	public void selectionChanged(IAction action, ISelection selection) {
-		super.selectionChanged(action, selection);
-		action.setEnabled(false);
-		if (selectedEntity instanceof TaskInfo) {
-			taskInfo = (TaskInfo) selectedEntity;
-			action.setEnabled(taskInfo.getStatus().getCode() == Status.STATUS_CODE_SUCCESS 
-							|| taskInfo.getStatus().getCode() == Status.STATUS_CODE_FAILURE);
-		} else {
-			action.setEnabled(false);
-		}
-	}
-
-	@Override
-	public void dispose() {
-
-	}
-}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ImportSshKeysAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ImportSshKeysAction.java
deleted file mode 100644
index 4bdb3835..00000000
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ImportSshKeysAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.gluster.storage.management.console.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.FileDialog;
-
-import com.gluster.storage.management.client.KeysClient;
-
-public class ImportSshKeysAction extends AbstractActionDelegate {
-
-	@Override
-	protected void performAction(IAction action) {
-		final KeysClient client = new KeysClient();
-
-		Display.getDefault().asyncExec(new Runnable() {
-			
-			@Override
-			public void run() {
-				FileDialog dialog = new FileDialog(getShell(), SWT.OPEN);
-				dialog.setText("Open");
-				dialog.setFilterNames(new String[] { "ssh-keys (*.tar)" });
-				dialog.setFilterExtensions(new String[] { "*.tar" });
-
-				String selectedFile = dialog.open();
-				if (selectedFile == null) {
-					return;
-				}
-
-				String title = "Import SSH Keys";
-				try {
-					client.importSshKeys(selectedFile);
-					showInfoDialog(title, "SSH keys imported successfully!");
-				} catch (Exception e) {
-					showErrorDialog(title, e.getMessage());
-				}
-			}
-		});		
-	}			
-
-	@Override
-	public void dispose() {
-	}
-}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ResumeTaskAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ResumeTaskAction.java
deleted file mode 100644
index d672a760..00000000
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ResumeTaskAction.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.gluster.storage.management.console.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-
-import com.gluster.storage.management.client.TasksClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.TaskStatus;
-
-public class ResumeTaskAction extends AbstractActionDelegate {
-	private TaskInfo taskInfo;
-	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
-
-	@Override
-	protected void performAction(final IAction action) {
-		final String actionDesc = action.getDescription();
-
-		try {
-			new TasksClient().resumeTask(taskInfo.getName());
-			taskInfo.setStatus(new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, "Resumed")));
-			modelManager.updateTask(taskInfo);
-		} catch (Exception e) {
-			showErrorDialog(actionDesc,
-					"Task [" + taskInfo.getDescription() + "] could not be Resumed! Error: [" + e.getMessage() + "]");
-		}
-	}
-	
-	@Override
-	public void selectionChanged(IAction action, ISelection selection) {
-		super.selectionChanged(action, selection);
-		action.setEnabled(false);
-		if (selectedEntity instanceof TaskInfo) {
-			taskInfo = (TaskInfo) selectedEntity;
-			action.setEnabled(taskInfo.getStatus().getCode() == Status.STATUS_CODE_PAUSE);
-		}
-	}
-	
-	@Override
-	public void dispose() {
-
-	}
-
-}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ServerAdditionAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ServerAdditionAction.java
deleted file mode 100644
index f47f6347..00000000
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ServerAdditionAction.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.gluster.storage.management.console.actions;
-
-import org.eclipse.jface.action.IAction;
-
-import com.gluster.storage.management.console.dialogs.ServerAdditionDialog;
-import com.gluster.storage.management.console.utils.GlusterLogger;
-
-public class ServerAdditionAction extends AbstractActionDelegate {
-	private static final GlusterLogger logger = GlusterLogger.getInstance();
-	@Override
-	public void dispose() {
-		// TODO Auto-generated method stub
-		
-	}
-
-	@Override
-	protected void performAction(IAction action) {
-		try {
-			// To open a dialog for server addition
-			ServerAdditionDialog dialog = new ServerAdditionDialog(getShell());
-			dialog.open();
-		} catch (Exception e) {
-			logger.error("Error in Manual server addition", e);
-			e.printStackTrace();
-		}
-	}
-
-}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopTaskAction.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopTaskAction.java
deleted file mode 100644
index 25afa320..00000000
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopTaskAction.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package com.gluster.storage.management.console.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-
-import com.gluster.storage.management.client.TasksClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-
-public class StopTaskAction extends AbstractActionDelegate {
-	private TaskInfo taskInfo;
-	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
-
-	@Override
-	protected void performAction(final IAction action) {
-		final String actionDesc = action.getDescription();
-
-		try {
-			new TasksClient().stopTask(taskInfo.getName());
-			// On successful stop clear from the task list
-			modelManager.removeTask(taskInfo);
-			action.setEnabled(false); // TODO disable other task buttons
-		} catch (Exception e) {
-			showErrorDialog(actionDesc,
-					"Task [" + taskInfo.getDescription() + "] could not be Stopped! Error: [" + e.getMessage() + "]");
-		}
-	}
-
-	@Override
-	public void selectionChanged(IAction action, ISelection selection) {
-		super.selectionChanged(action, selection);
-		action.setEnabled(false);
-		if (selectedEntity instanceof TaskInfo) {
-			taskInfo = (TaskInfo) selectedEntity;
-			action.setEnabled(taskInfo.getStopSupported()
-					&& (taskInfo.getStatus().getCode() == Status.STATUS_CODE_PAUSE 
-							|| taskInfo.getStatus().getCode() == Status.STATUS_CODE_RUNNING));
-		}
-	}
-
-	@Override
-	public void dispose() {
-	}
-
-}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitializeDiskTypeSelection.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitializeDiskTypeSelection.java
deleted file mode 100644
index 4b64ea96..00000000
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/InitializeDiskTypeSelection.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * 
- * InitializeDiskTypeSelection.java
- * 
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
- *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- *******************************************************************************/
-package com.gluster.storage.management.console.dialogs;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.GlusterConstants;
-
-public class InitializeDiskTypeSelection extends Dialog  {
-	
-	private Combo formatTypeCombo = null;
-	private final GUIHelper guiHelper = GUIHelper.getInstance();
-	private Composite initializeDiskTypeComposite;
-	private Composite composite;
-	private String fsType;
-
-	public InitializeDiskTypeSelection(Shell parentShell) {
-		super(parentShell);
-		// TODO Auto-generated constructor stub
-	}
-	
-	@Override
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-
-		newShell.setText("Gluster Management Console - Select File System Type");
-		addEscapeListener(newShell);
-	}
-	
-	private void addEscapeListener(Shell shell) {
-		shell.addTraverseListener(new TraverseListener() {
-
-			@Override
-			public void keyTraversed(TraverseEvent e) {
-				if (e.keyCode == SWT.ESC) {
-					cancelPressed();
-				}
-			}
-		});
-	}
-	
-	@Override
-	protected Control createDialogArea(Composite parent) {
-		// Makes sure that child composites inherit the same background
-		parent.setBackgroundMode(SWT.INHERIT_FORCE); 
-		
-		composite =  (Composite) super.createDialogArea(parent);
-		configureDialogLayout(composite);
-		createComposite(composite);
-		return composite;
-	}
-	
-	private void configureDialogLayout(Composite composite) {
-		GridLayout layout = (GridLayout) composite.getLayout();
-		layout.numColumns = 3;
-		layout.marginLeft = 20;
-		layout.marginRight = 20;
-		layout.marginTop = 20;
-		layout.horizontalSpacing = 20;
-		layout.verticalSpacing = 20;
-	}
-	
-	private void createComposite(Composite composite) {
-		initializeDiskTypeComposite = new Composite(composite, SWT.NONE);
-		GridLayout layout = new GridLayout(3, false);
-		initializeDiskTypeComposite.setLayout(layout);
-
-		createLabel(initializeDiskTypeComposite, "Format disk using ");
-		createFormatTypeCombo(initializeDiskTypeComposite);
-		createLabel(initializeDiskTypeComposite, " file system");
-	}
-	
-	private void createLabel(Composite composite, String labelText) {
-		Label formatTypeLabel = new Label(composite, SWT.NONE);
-		formatTypeLabel.setText(labelText);
-		formatTypeLabel.setLayoutData(new GridData(GridData.END, GridData.CENTER, false, false));
-	}
-	
-	private void createFormatTypeCombo(Composite composite) {
-		List<String> fsType = new ArrayList<String>();
-		fsType.add(GlusterConstants.FSTYPE_DEFAULT);
-		fsType.add(GlusterConstants.FSTYPE_EXT_3);
-		fsType.add(GlusterConstants.FSTYPE_EXT_4);
-		fsType.add(GlusterConstants.FSTYPE_XFS);
-		formatTypeCombo = new Combo(composite, SWT.READ_ONLY);
-		formatTypeCombo.setItems(fsType.toArray(new String[0]));
-		formatTypeCombo.select(0);
-	}
-	
-	@Override
-	protected void okPressed() {
-		fsType = formatTypeCombo.getText();
-		super.okPressed();
-	}
-	
-	@Override
-	public void cancelPressed() {
-		super.cancelPressed();
-	}
-	
-	/**
-	 * Overriding to make sure that the dialog is centered in screen
-	 */
-	@Override
-	protected void initializeBounds() {
-		super.initializeBounds();
-
-		guiHelper.centerShellInScreen(getShell());
-	}
-	
-	public String getFSType() {
-		return fsType.trim();
-	}
-
-}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DisksView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DisksView.java
deleted file mode 100644
index 7ba1a88a..00000000
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DisksView.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.gluster.storage.management.console.views;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.part.ViewPart;
-
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.DisksPage;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.GlusterServer;
-
-public class DisksView extends ViewPart {
-	public static final String ID = DisksView.class.getName();
-	private static final GUIHelper guiHelper = GUIHelper.getInstance();
-	private EntityGroup<GlusterServer> servers;
-	private DisksPage page;
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public void createPartControl(Composite parent) {
-		if (servers == null) {
-			servers = guiHelper.getSelectedEntity(getSite(), EntityGroup.class);
-		}
-		
-		page = new DisksPage(parent, SWT.NONE, getSite(), getAllDisks(servers));
-		//page.layout(); // IMP: lays out the form properly
-	}
-
-	private List<Disk> getAllDisks(EntityGroup<GlusterServer> servers) {
-		List<Disk> disks = new ArrayList<Disk>();
-		for(GlusterServer server : servers.getEntities()) {
-			disks.addAll(server.getDisks());
-		}
-		return disks;
-	}
-
-	@Override
-	public void setFocus() {
-		page.setFocus();
-	}
-}
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/TasksView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/TasksView.java
deleted file mode 100644
index e408e64e..00000000
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/TasksView.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.gluster.storage.management.console.views;
-
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.part.ViewPart;
-
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.views.pages.TasksPage;
-import com.gluster.storage.management.core.model.TaskInfo;
-
-public class TasksView extends ViewPart {
-	
-	public static final String ID = TasksView.class.getName();
-	private TasksPage page;
-	
-
-	public TasksView() {
-		// TODO Auto-generated constructor stub
-	}
-
-	@Override
-	public void createPartControl(Composite parent) {
-		page = new TasksPage(getSite(), parent, SWT.NONE, getAllTasks());
-		page.layout(); // IMP: lays out the form properly
-	}
-
-	
-	private List<TaskInfo> getAllTasks() {
-		return GlusterDataModelManager.getInstance().getModel().getCluster().getTaskInfoList();
-	}
-
-	@Override
-	public void setFocus() {
-		page.setFocus();
-	}
-
-}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ViewsManager.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ViewsManager.java
deleted file mode 100644
index 5b19ea98..00000000
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ViewsManager.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * ViewsManager.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
- *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.views;
-
-import com.gluster.storage.management.core.model.Entity;
-
-/**
- * Whenever the current selection/action demands opening different set of views, the views manager is used to open
- * appropriate views.
- */
-public interface ViewsManager {
-	/**
-	 * Updates the views for given entity. This typically means that user is working with the given entity, and hence
-	 * the views related to that entity should be made visible, and other un-related views should be hidden.
-	 * 
-	 * @param entity
-	 *            The entity for which views are to be updated
-	 */
-	public void updateViews(Entity entity);
-}
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeBricksView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeBricksView.java
deleted file mode 100644
index 33cd1f38..00000000
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeBricksView.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.gluster.storage.management.console.views;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.part.ViewPart;
-
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.BricksPage;
-import com.gluster.storage.management.core.model.Volume;
-
-public class VolumeBricksView extends ViewPart {
-	public static final String ID = VolumeBricksView.class.getName();
-	private static final GUIHelper guiHelper = GUIHelper.getInstance();
-	private BricksPage page;
-	private Volume volume;
-
-	@Override
-	public void createPartControl(Composite parent) {
-		if (volume == null) {
-			volume = guiHelper.getSelectedEntity(getSite(), Volume.class);
-		}
-
-		createPage(parent);
-	}
-
-	/**
-	 * @param parent
-	 */
-	private void createPage(Composite parent) {
-		page = new BricksPage(parent, SWT.NONE, getSite(), volume.getBricks());
-		parent.layout(); // IMP: lays out the form properly
-	}
-
-	@Override
-	public void setFocus() {
-		page.setFocus();
-	}
-}
-
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeLogsView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeLogsView.java
deleted file mode 100644
index 7f35d332..00000000
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeLogsView.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.gluster.storage.management.console.views;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.part.ViewPart;
-
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.VolumeLogsPage;
-import com.gluster.storage.management.core.model.Volume;
-
-public class VolumeLogsView extends ViewPart {
-	VolumeLogsPage logsPage;
-	public static final String ID = VolumeLogsView.class.getName();
-	private static final GUIHelper guiHelper = GUIHelper.getInstance();
-	private Volume volume;
-
-	@Override
-	public void createPartControl(Composite parent) {
-		if (volume == null) {
-			volume = guiHelper.getSelectedEntity(getSite(), Volume.class);
-		}
-
-		createPage(parent);
-	}
-
-	private void createPage(Composite parent) {
-		logsPage = new VolumeLogsPage(parent, SWT.NONE, volume);
-		parent.layout(); // IMP: lays out the form properly
-	}
-
-	@Override
-	public void setFocus() {
-		logsPage.setFocus();
-	}
-}
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeOptionsView.java b/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeOptionsView.java
deleted file mode 100644
index 7129df5d..00000000
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeOptionsView.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.gluster.storage.management.console.views;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.part.ViewPart;
-
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.VolumeOptionsPage;
-import com.gluster.storage.management.core.model.Volume;
-
-public class VolumeOptionsView extends ViewPart {
-	public static final String ID = VolumeOptionsView.class.getName();
-	private static final GUIHelper guiHelper = GUIHelper.getInstance();
-	private VolumeOptionsPage page;
-	private Volume volume;
-
-	@Override
-	public void createPartControl(Composite parent) {
-		if (volume == null) {
-			volume = guiHelper.getSelectedEntity(getSite(), Volume.class);
-		}
-
-		createPage(parent);
-	}
-
-	private void createPage(Composite parent) {
-		page = new VolumeOptionsPage(parent, SWT.NONE, volume);
-		parent.layout(); // IMP: lays out the form properly
-	}
-
-	@Override
-	public void setFocus() {
-		page.setFocus();
-	}
-}
-
diff --git a/src/com.gluster.storage.management.console/src/test.xml b/src/com.gluster.storage.management.console/src/test.xml
deleted file mode 100644
index 12bbf745..00000000
--- a/src/com.gluster.storage.management.console/src/test.xml
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
diff --git a/src/com.gluster.storage.management.core/META-INF/MANIFEST.MF b/src/com.gluster.storage.management.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 9ddbca69..00000000
--- a/src/com.gluster.storage.management.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Gluster Storage Platform Core
-Bundle-SymbolicName: com.gluster.storage.management.core
-Bundle-Version: 1.0.0
-Bundle-Vendor: GLUSTER
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: com.gluster.storage.management.core.constants,
- com.gluster.storage.management.core.exceptions,
- com.gluster.storage.management.core.model,
- com.gluster.storage.management.core.response,
- com.gluster.storage.management.core.utils
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0"
-Bundle-ClassPath: .
-Import-Package: com.gluster.storage.management.core.exceptions
diff --git a/src/com.gluster.storage.management.core/build.properties b/src/com.gluster.storage.management.core/build.properties
deleted file mode 100644
index 89d32a46..00000000
--- a/src/com.gluster.storage.management.core/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               lib/
-src.includes = lib/,\
-               src/
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/exceptions/GlusterValidationException.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/exceptions/GlusterValidationException.java
deleted file mode 100644
index ca5e01f8..00000000
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/exceptions/GlusterValidationException.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
- *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- *******************************************************************************/
-package com.gluster.storage.management.core.exceptions;
-
-public class GlusterValidationException extends GlusterRuntimeException {
-	private static final long serialVersionUID = 1L;
-
-	public GlusterValidationException(String message) {
-		super(message);
-	}
-}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/AbstractResponse.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/AbstractResponse.java
deleted file mode 100644
index 9a6a48f5..00000000
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/AbstractResponse.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
- *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- *******************************************************************************/
-package com.gluster.storage.management.core.response;

-
-import com.gluster.storage.management.core.model.Response;
-import com.gluster.storage.management.core.model.Status;
-

-public abstract class AbstractResponse implements Response {

-	private Status status;

-

-	@Override

-	public Status getStatus() {

-		return status;

-	}

-

-	public void setStatus(Status status) {

-		this.status = status;

-	}

-}
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/GlusterServerResponse.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/GlusterServerResponse.java
deleted file mode 100644
index 7af9b240..00000000
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/GlusterServerResponse.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.gluster.storage.management.core.response;
-
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlTransient;
-
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Status;
-
-@XmlRootElement(name = "response")
-public class GlusterServerResponse extends AbstractResponse {
-	private GlusterServer glusterServer;
-	
-	public GlusterServerResponse() {
-	}
-	
-	public GlusterServerResponse(Status status, GlusterServer server) {
-		setStatus(status);
-		setGlusterServer(server);
-	}
-	
-	public GlusterServer getGlusterServer() {
-		return glusterServer;
-	}
-
-	public void setGlusterServer(GlusterServer glusterServer) {
-		this.glusterServer = glusterServer;
-	}
-
-	@XmlTransient
-	@Override
-	public GlusterServer getData() {
-		return getGlusterServer();
-	}
-	
-}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/LogMessageListResponse.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/LogMessageListResponse.java
deleted file mode 100644
index 8c362fa9..00000000
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/LogMessageListResponse.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * 
- */
-package com.gluster.storage.management.core.response;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.gluster.storage.management.core.model.VolumeLogMessage;
-
-@XmlRootElement(name = "logMessages")
-public class LogMessageListResponse {
-	private List<VolumeLogMessage> logMessages = new ArrayList<VolumeLogMessage>();
-	
-	public LogMessageListResponse() {
-	}
-	
-	public LogMessageListResponse(List<VolumeLogMessage> logMessages) {
-		setLogMessages(logMessages);
-	}
-	
-	@XmlElement(name = "logMessage", type = VolumeLogMessage.class)
-	public List<VolumeLogMessage> getLogMessages() {
-		return logMessages;
-	}
-
-	public void setLogMessages(List<VolumeLogMessage> logMessages) {
-		this.logMessages = logMessages;
-	}
-}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskResponse.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskResponse.java
deleted file mode 100755
index a11c9903..00000000
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskResponse.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * TaskInfoResponse.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
- *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.core.response;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-
-@XmlRootElement(name = "response")
-public class TaskResponse  extends AbstractResponse {
-	private TaskInfo taskInfo;
-	private Status status;
-	
-	public TaskResponse() {
-	}
-	
-	public Status getStatus() {
-		return status;
-	}
-
-	public void setStatus(Status status) {
-		this.status = status;
-	}
-
-	public void setData(TaskInfo taskInfo) {
-		this.taskInfo = taskInfo;
-	}
-	
-	@Override
-	public TaskInfo getData() {
-		return taskInfo;
-	}
-}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/VolumeListResponse.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/VolumeListResponse.java
deleted file mode 100644
index 6518f0d5..00000000
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/VolumeListResponse.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.gluster.storage.management.core.response;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.gluster.storage.management.core.model.Volume;
-
-@XmlRootElement(name = "volumes")
-public class VolumeListResponse {
-	private List<Volume> volumes = new ArrayList<Volume>();
-
-	public VolumeListResponse() {
-
-	}
-
-	public VolumeListResponse(List<Volume> volumes) {
-		setVolumes(volumes);
-	}
-
-	@XmlElement(name = "volume", type = Volume.class)
-	public List<Volume> getVolumes() {
-		return this.volumes;
-	}
-
-	public void setVolumes(List<Volume> volumes) {
-		this.volumes = volumes;
-	}
-}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/MD5.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/MD5.java
deleted file mode 100644
index e0daaf81..00000000
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/MD5.java
+++ /dev/null
@@ -1,504 +0,0 @@
-/*
- * MD5 in Java JDK Beta-2
- * written Santeri Paavolainen, Helsinki Finland 1996
- * (c) Santeri Paavolainen, Helsinki Finland 1996
- *
- * 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 2 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *
- * See http://www.cs.hut.fi/~santtu/java/ for more information on this
- * class.
- * 
- * This is rather straight re-implementation of the reference implementation
- * given in RFC1321 by RSA.
- *
- * Passes MD5 test suite as defined in RFC1321.
- *
- *
- * This Java class has been derivedfrom the RSA Data Security, Inc. MD5 
- * Message-Digest Algorithm and its reference implementation. 
- *
- *
- * $Log: MD5.java,v $
- * Revision 1.1  2004/07/12 13:35:20  aubryp
- * initial commit
- *
- * Revision 1.3  2002/03/16 01:46:39  broccol
- * Moved the MD5 classes into the md5 package to make 1.4 javac happy
- *
- * Revision 1.2  1999/11/04 21:38:00  broccol
- * Got MD5Crypt calculating the same hash as the OpenBSD md5crypt.c routine.
- *
- * Revision 1.1  1999/08/05 22:07:03  broccol
- * Added support for the MD5 classes.
- *
- * Revision 1.3  1996/04/15 07:28:09  santtu
- * Added GPL statements, and RSA derivate statements.
- *
- * Revision 1.2  1996/03/04 08:05:48  santtu
- * Added offsets to Update method
- *
- * Revision 1.1  1996/01/07 20:51:59  santtu
- * Initial revision
- *
- */
-package com.gluster.storage.management.core.utils;
-
-/**
- * Contains internal state of the MD5 class
- *
- * @author	Santeri Paavolainen <sjpaavol@cc.helsinki.fi>
- */
-
-class MD5State {
-    /**
-     * 128-byte state 
-     */
-    int state[];
-
-    /**
-     * 64-bit character count (could be true Java long?)
-     */
-    int count[];
-
-    /**
-     * 64-byte buffer (512 bits) for storing to-be-hashed characters
-     */
-    byte buffer[];
-
-    public MD5State() {
-        buffer = new byte[64];
-        count = new int[2];
-        state = new int[4];
-
-        state[0] = 0x67452301;
-        state[1] = 0xefcdab89;
-        state[2] = 0x98badcfe;
-        state[3] = 0x10325476;
-
-        count[0] = count[1] = 0;
-    }
-
-    /** Create this State as a copy of another state */
-    public MD5State(MD5State from) {
-        this ();
-
-        int i;
-
-        for (i = 0; i < buffer.length; i++)
-            this .buffer[i] = from.buffer[i];
-
-        for (i = 0; i < state.length; i++)
-            this .state[i] = from.state[i];
-
-        for (i = 0; i < count.length; i++)
-            this .count[i] = from.count[i];
-    }
-};
-
-/**
- * Implementation of RSA's MD5 hash generator
- *
- * @version	$Revision: 1.1 $
- * @author	Santeri Paavolainen <sjpaavol@cc.helsinki.fi>
- */
-
-public class MD5 {
-    /**
-     * MD5 state
-     */
-    MD5State state;
-
-    /**
-     * If Final() has been called, finals is set to the current finals
-     * state. Any Update() causes this to be set to null.
-     */
-    MD5State finals;
-
-    /** 
-     * Padding for Final()
-     */
-    static byte padding[] = { (byte) 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-            0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-
-    /**
-     * Initialize MD5 internal state (object can be reused just by
-     * calling Init() after every Final()
-     */
-    public synchronized void Init() {
-        state = new MD5State();
-        finals = null;
-    }
-
-    /**
-     * Class constructor
-     */
-    public MD5() {
-        this .Init();
-    }
-
-    /**
-     * Initialize class, and update hash with ob.toString()
-     *
-     * @param	ob	Object, ob.toString() is used to update hash
-     *			after initialization
-     */
-    public MD5(Object ob) {
-        this ();
-        Update(ob.toString());
-    }
-
-    public String debugDump() {
-        return asHex();
-    }
-
-    private int rotate_left(int x, int n) {
-        return (x << n) | (x >>> (32 - n));
-    }
-
-    /* I wonder how many loops and hoops you'll have to go through to
-       get unsigned add for longs in java */
-
-    private int uadd(int a, int b) {
-        long aa, bb;
-        aa = ((long) a) & 0xffffffffL;
-        bb = ((long) b) & 0xffffffffL;
-
-        aa += bb;
-
-        return (int) (aa & 0xffffffffL);
-    }
-
-    private int uadd(int a, int b, int c) {
-        return uadd(uadd(a, b), c);
-    }
-
-    private int uadd(int a, int b, int c, int d) {
-        return uadd(uadd(a, b, c), d);
-    }
-
-    private int FF(int a, int b, int c, int d, int x, int s, int ac) {
-        a = uadd(a, ((b & c) | (~b & d)), x, ac);
-        return uadd(rotate_left(a, s), b);
-    }
-
-    private int GG(int a, int b, int c, int d, int x, int s, int ac) {
-        a = uadd(a, ((b & d) | (c & ~d)), x, ac);
-        return uadd(rotate_left(a, s), b);
-    }
-
-    private int HH(int a, int b, int c, int d, int x, int s, int ac) {
-        a = uadd(a, (b ^ c ^ d), x, ac);
-        return uadd(rotate_left(a, s), b);
-    }
-
-    private int II(int a, int b, int c, int d, int x, int s, int ac) {
-        a = uadd(a, (c ^ (b | ~d)), x, ac);
-        return uadd(rotate_left(a, s), b);
-    }
-
-    private int[] Decode(byte buffer[], int len, int shift) {
-        int out[];
-        int i, j;
-
-        out = new int[16];
-
-        for (i = j = 0; j < len; i++, j += 4) {
-            out[i] = ((int) (buffer[j + shift] & 0xff))
-                    | (((int) (buffer[j + 1 + shift] & 0xff)) << 8)
-                    | (((int) (buffer[j + 2 + shift] & 0xff)) << 16)
-                    | (((int) (buffer[j + 3 + shift] & 0xff)) << 24);
-        }
-
-        return out;
-    }
-
-    private void Transform(MD5State state, byte buffer[], int shift) {
-        int a = state.state[0], b = state.state[1], c = state.state[2], d = state.state[3], x[];
-
-        x = Decode(buffer, 64, shift);
-
-        /* Round 1 */
-        a = FF(a, b, c, d, x[0], 7, 0xd76aa478); /* 1 */
-        d = FF(d, a, b, c, x[1], 12, 0xe8c7b756); /* 2 */
-        c = FF(c, d, a, b, x[2], 17, 0x242070db); /* 3 */
-        b = FF(b, c, d, a, x[3], 22, 0xc1bdceee); /* 4 */
-        a = FF(a, b, c, d, x[4], 7, 0xf57c0faf); /* 5 */
-        d = FF(d, a, b, c, x[5], 12, 0x4787c62a); /* 6 */
-        c = FF(c, d, a, b, x[6], 17, 0xa8304613); /* 7 */
-        b = FF(b, c, d, a, x[7], 22, 0xfd469501); /* 8 */
-        a = FF(a, b, c, d, x[8], 7, 0x698098d8); /* 9 */
-        d = FF(d, a, b, c, x[9], 12, 0x8b44f7af); /* 10 */
-        c = FF(c, d, a, b, x[10], 17, 0xffff5bb1); /* 11 */
-        b = FF(b, c, d, a, x[11], 22, 0x895cd7be); /* 12 */
-        a = FF(a, b, c, d, x[12], 7, 0x6b901122); /* 13 */
-        d = FF(d, a, b, c, x[13], 12, 0xfd987193); /* 14 */
-        c = FF(c, d, a, b, x[14], 17, 0xa679438e); /* 15 */
-        b = FF(b, c, d, a, x[15], 22, 0x49b40821); /* 16 */
-
-        /* Round 2 */
-        a = GG(a, b, c, d, x[1], 5, 0xf61e2562); /* 17 */
-        d = GG(d, a, b, c, x[6], 9, 0xc040b340); /* 18 */
-        c = GG(c, d, a, b, x[11], 14, 0x265e5a51); /* 19 */
-        b = GG(b, c, d, a, x[0], 20, 0xe9b6c7aa); /* 20 */
-        a = GG(a, b, c, d, x[5], 5, 0xd62f105d); /* 21 */
-        d = GG(d, a, b, c, x[10], 9, 0x2441453); /* 22 */
-        c = GG(c, d, a, b, x[15], 14, 0xd8a1e681); /* 23 */
-        b = GG(b, c, d, a, x[4], 20, 0xe7d3fbc8); /* 24 */
-        a = GG(a, b, c, d, x[9], 5, 0x21e1cde6); /* 25 */
-        d = GG(d, a, b, c, x[14], 9, 0xc33707d6); /* 26 */
-        c = GG(c, d, a, b, x[3], 14, 0xf4d50d87); /* 27 */
-        b = GG(b, c, d, a, x[8], 20, 0x455a14ed); /* 28 */
-        a = GG(a, b, c, d, x[13], 5, 0xa9e3e905); /* 29 */
-        d = GG(d, a, b, c, x[2], 9, 0xfcefa3f8); /* 30 */
-        c = GG(c, d, a, b, x[7], 14, 0x676f02d9); /* 31 */
-        b = GG(b, c, d, a, x[12], 20, 0x8d2a4c8a); /* 32 */
-
-        /* Round 3 */
-        a = HH(a, b, c, d, x[5], 4, 0xfffa3942); /* 33 */
-        d = HH(d, a, b, c, x[8], 11, 0x8771f681); /* 34 */
-        c = HH(c, d, a, b, x[11], 16, 0x6d9d6122); /* 35 */
-        b = HH(b, c, d, a, x[14], 23, 0xfde5380c); /* 36 */
-        a = HH(a, b, c, d, x[1], 4, 0xa4beea44); /* 37 */
-        d = HH(d, a, b, c, x[4], 11, 0x4bdecfa9); /* 38 */
-        c = HH(c, d, a, b, x[7], 16, 0xf6bb4b60); /* 39 */
-        b = HH(b, c, d, a, x[10], 23, 0xbebfbc70); /* 40 */
-        a = HH(a, b, c, d, x[13], 4, 0x289b7ec6); /* 41 */
-        d = HH(d, a, b, c, x[0], 11, 0xeaa127fa); /* 42 */
-        c = HH(c, d, a, b, x[3], 16, 0xd4ef3085); /* 43 */
-        b = HH(b, c, d, a, x[6], 23, 0x4881d05); /* 44 */
-        a = HH(a, b, c, d, x[9], 4, 0xd9d4d039); /* 45 */
-        d = HH(d, a, b, c, x[12], 11, 0xe6db99e5); /* 46 */
-        c = HH(c, d, a, b, x[15], 16, 0x1fa27cf8); /* 47 */
-        b = HH(b, c, d, a, x[2], 23, 0xc4ac5665); /* 48 */
-
-        /* Round 4 */
-        a = II(a, b, c, d, x[0], 6, 0xf4292244); /* 49 */
-        d = II(d, a, b, c, x[7], 10, 0x432aff97); /* 50 */
-        c = II(c, d, a, b, x[14], 15, 0xab9423a7); /* 51 */
-        b = II(b, c, d, a, x[5], 21, 0xfc93a039); /* 52 */
-        a = II(a, b, c, d, x[12], 6, 0x655b59c3); /* 53 */
-        d = II(d, a, b, c, x[3], 10, 0x8f0ccc92); /* 54 */
-        c = II(c, d, a, b, x[10], 15, 0xffeff47d); /* 55 */
-        b = II(b, c, d, a, x[1], 21, 0x85845dd1); /* 56 */
-        a = II(a, b, c, d, x[8], 6, 0x6fa87e4f); /* 57 */
-        d = II(d, a, b, c, x[15], 10, 0xfe2ce6e0); /* 58 */
-        c = II(c, d, a, b, x[6], 15, 0xa3014314); /* 59 */
-        b = II(b, c, d, a, x[13], 21, 0x4e0811a1); /* 60 */
-        a = II(a, b, c, d, x[4], 6, 0xf7537e82); /* 61 */
-        d = II(d, a, b, c, x[11], 10, 0xbd3af235); /* 62 */
-        c = II(c, d, a, b, x[2], 15, 0x2ad7d2bb); /* 63 */
-        b = II(b, c, d, a, x[9], 21, 0xeb86d391); /* 64 */
-
-        state.state[0] += a;
-        state.state[1] += b;
-        state.state[2] += c;
-        state.state[3] += d;
-    }
-
-    /**	
-     * Updates hash with the bytebuffer given (using at maximum length bytes from
-     * that buffer)
-     *
-     * @param stat 	Which state is updated
-     * @param buffer	Array of bytes to be hashed
-     * @param offset	Offset to buffer array
-     * @param length	Use at maximum `length' bytes (absolute
-     *			maximum is buffer.length)
-     */
-    public void Update(MD5State stat, byte buffer[], int offset,
-            int length) {
-        int index, partlen, i, start;
-
-        finals = null;
-
-        /* Length can be told to be shorter, but not inter */
-        if ((length - offset) > buffer.length)
-            length = buffer.length - offset;
-
-        /* compute number of bytes mod 64 */
-        index = (int) (stat.count[0] >>> 3) & 0x3f;
-
-        if ((stat.count[0] += (length << 3)) < (length << 3))
-            stat.count[1]++;
-
-        stat.count[1] += length >>> 29;
-
-        partlen = 64 - index;
-
-        if (length >= partlen) {
-            for (i = 0; i < partlen; i++)
-                stat.buffer[i + index] = buffer[i + offset];
-
-            Transform(stat, stat.buffer, 0);
-
-            for (i = partlen; (i + 63) < length; i += 64)
-                Transform(stat, buffer, i);
-
-            index = 0;
-        } else
-            i = 0;
-
-        /* buffer remaining input */
-        if (i < length) {
-            start = i;
-            for (; i < length; i++)
-                stat.buffer[index + i - start] = buffer[i + offset];
-        }
-    }
-
-    /* 
-     * Update()s for other datatypes than byte[] also. Update(byte[], int)
-     * is only the main driver.
-     */
-
-    /**
-     * Plain update, updates this object
-     */
-
-    public void Update(byte buffer[], int offset, int length) {
-        Update(this .state, buffer, offset, length);
-    }
-
-    public void Update(byte buffer[], int length) {
-        Update(this .state, buffer, 0, length);
-    }
-
-    /**
-     * Updates hash with given array of bytes
-     *
-     * @param buffer	Array of bytes to use for updating the hash
-     */
-    public void Update(byte buffer[]) {
-        Update(buffer, 0, buffer.length);
-    }
-
-    /**
-     * Updates hash with a single byte
-     *
-     * @param b		Single byte to update the hash
-     */
-    public void Update(byte b) {
-        byte buffer[] = new byte[1];
-        buffer[0] = b;
-
-        Update(buffer, 1);
-    }
-
-    /**
-     * Update buffer with given string.
-     *
-     * @param s		String to be update to hash (is used as
-     *		       	s.getBytes())
-     */
-    public void Update(String s) {
-        byte chars[];
-
-        chars = s.getBytes();
-
-        Update(chars, chars.length);
-    }
-
-    private byte[] Encode(int input[], int len) {
-        int i, j;
-        byte out[];
-
-        out = new byte[len];
-
-        for (i = j = 0; j < len; i++, j += 4) {
-            out[j] = (byte) (input[i] & 0xff);
-            out[j + 1] = (byte) ((input[i] >>> 8) & 0xff);
-            out[j + 2] = (byte) ((input[i] >>> 16) & 0xff);
-            out[j + 3] = (byte) ((input[i] >>> 24) & 0xff);
-        }
-
-        return out;
-    }
-
-    /**
-     * Returns array of bytes (16 bytes) representing hash as of the
-     * current state of this object. Note: getting a hash does not
-     * invalidate the hash object, it only creates a copy of the real
-     * state which is finalized. 
-     *
-     * @return	Array of 16 bytes, the hash of all updated bytes
-     */
-    public synchronized byte[] Final() {
-        byte bits[];
-        int index, padlen;
-        MD5State fin;
-
-        if (finals == null) {
-            fin = new MD5State(state);
-
-            bits = Encode(fin.count, 8);
-
-            index = (int) ((fin.count[0] >>> 3) & 0x3f);
-            padlen = (index < 56) ? (56 - index) : (120 - index);
-
-            Update(fin, padding, 0, padlen);
-            /**/
-            Update(fin, bits, 0, 8);
-
-            /* Update() sets finalds to null */
-            finals = fin;
-        }
-
-        return Encode(finals.state, 16);
-    }
-
-    /**
-     * Turns array of bytes into string representing each byte as
-     * unsigned hex number.
-     * 
-     * @param hash	Array of bytes to convert to hex-string
-     * @return	Generated hex string
-     */
-    public static String asHex(byte hash[]) {
-        StringBuffer buf = new StringBuffer(hash.length * 2);
-        int i;
-
-        for (i = 0; i < hash.length; i++) {
-            if (((int) hash[i] & 0xff) < 0x10)
-                buf.append("0");
-
-            buf.append(Long.toString((int) hash[i] & 0xff, 16));
-        }
-
-        return buf.toString();
-    }
-
-    /**
-     * Returns 32-character hex representation of this objects hash
-     *
-     * @return String of this object's hash
-     */
-    public String asHex() {
-        return asHex(this .Final());
-    }
-
-    /**
-     * One-stop md5 string encrypting.
-     */
-
-    public static String md5crypt(String input) {
-        MD5 md5 = new MD5();
-        md5.Init();
-        md5.Update(input);
-        return md5.asHex();
-    }
-}
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/MD5Crypt.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/MD5Crypt.java
deleted file mode 100644
index 25c757a2..00000000
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/MD5Crypt.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*------------------------------------------------------------------------------
- class
- MD5Crypt
- ------------------------------------------------------------------------------*/
-
-package com.gluster.storage.management.core.utils;
-
-
-/**
- * <p>This class defines a method,
- * {@link MD5Crypt#crypt(java.lang.String, java.lang.String) crypt()}, which
- * takes a password and a salt string and generates an OpenBSD/FreeBSD/Linux-compatible
- * md5-encoded password entry.</p>
- *
- * <p>Created: 3 November 1999</p>
- * <p>Release: $Name:  $</p>
- * <p>Version: $Revision: 1.1 $</p>
- * <p>Last Mod Date: $Date: 2004/07/12 13:35:20 $</p>
- * <p>Java Code By: Jonathan Abbey, jonabbey@arlut.utexas.edu</p>
- * <p>Original C Version:<pre>
- * ----------------------------------------------------------------------------
- * "THE BEER-WARE LICENSE" (Revision 42):
- * <phk@login.dknet.dk> wrote this file.  As long as you retain this notice you
- * can do whatever you want with this stuff. If we meet some day, and you think
- * this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
- * ----------------------------------------------------------------------------
- * </pre></p>
- *
- * @author Jonathan Abbey <jonabbey at arlut.utexas.edu>
- */
-public final class MD5Crypt {
-
-    /**
-     *
-     * Command line test rig.
-     *
-     */
-
-    static public void main(String argv[]) {
-        if ((argv.length < 1) || (argv.length > 3)) {
-            System.err
-                    .println("Usage: MD5Crypt [-apache] password salt");
-            System.exit(1);
-        }
-
-        if (argv.length == 3) {
-            System.err.println(MD5Crypt.apacheCrypt(argv[1], argv[2]));
-        } else if (argv.length == 2) {
-            System.err.println(MD5Crypt.crypt(argv[0], argv[1]));
-        } else {
-            System.err.println(MD5Crypt.crypt(argv[0]));
-        }
-    	
-        System.exit(0);
-    }
-
-    static private final String SALTCHARS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890";
-
-    static private final String itoa64 = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-    static private final String to64(long v, int size) {
-        StringBuffer result = new StringBuffer();
-
-        while (--size >= 0) {
-            result.append(itoa64.charAt((int) (v & 0x3f)));
-            v >>>= 6;
-        }
-
-        return result.toString();
-    }
-
-    static private final void clearbits(byte bits[]) {
-        for (int i = 0; i < bits.length; i++) {
-            bits[i] = 0;
-        }
-    }
-
-    /**
-     * convert an encoded unsigned byte value into a int
-     * with the unsigned value.
-     */
-
-    static private final int bytes2u(byte inp) {
-        return (int) inp & 0xff;
-    }
-
-    /**
-     * <p>This method actually generates a OpenBSD/FreeBSD/Linux PAM compatible
-     * md5-encoded password hash from a plaintext password and a
-     * salt.</p>
-     *
-     * <p>The resulting string will be in the form '$1$&lt;salt&gt;$&lt;hashed mess&gt;</p>
-     *
-     * @param password Plaintext password
-     *
-     * @return An OpenBSD/FreeBSD/Linux-compatible md5-hashed password field.
-     */
-
-    static public final String crypt(String password) {
-        StringBuffer salt = new StringBuffer();
-        java.util.Random randgen = new java.util.Random();
-
-        /* -- */
-
-        while (salt.length() < 8) {
-            int index = (int) (randgen.nextFloat() * SALTCHARS.length());
-            salt.append(SALTCHARS.substring(index, index + 1));
-        }
-
-        return MD5Crypt.crypt(password, salt.toString());
-    }
-
-    /**
-     * <p>This method actually generates a OpenBSD/FreeBSD/Linux PAM compatible
-     * md5-encoded password hash from a plaintext password and a
-     * salt.</p>
-     *
-     * <p>The resulting string will be in the form '$1$&lt;salt&gt;$&lt;hashed mess&gt;</p>
-     *
-     * @param password Plaintext password
-     * @param salt A short string to use to randomize md5.  May start with $1$, which
-     *             will be ignored.  It is explicitly permitted to pass a pre-existing
-     *             MD5Crypt'ed password entry as the salt.  crypt() will strip the salt
-     *             chars out properly.
-     *
-     * @return An OpenBSD/FreeBSD/Linux-compatible md5-hashed password field.
-     */
-
-    static public final String crypt(String password, String salt) {
-        return MD5Crypt.crypt(password, salt, "$1$");
-    }
-
-    /**
-     * <p>This method generates an Apache MD5 compatible
-     * md5-encoded password hash from a plaintext password and a
-     * salt.</p>
-     *
-     * <p>The resulting string will be in the form '$apr1$&lt;salt&gt;$&lt;hashed mess&gt;</p>
-     *
-     * @param password Plaintext password
-     *
-     * @return An Apache-compatible md5-hashed password string.
-     */
-
-    static public final String apacheCrypt(String password) {
-        StringBuffer salt = new StringBuffer();
-        java.util.Random randgen = new java.util.Random();
-
-        /* -- */
-
-        while (salt.length() < 8) {
-            int index = (int) (randgen.nextFloat() * SALTCHARS.length());
-            salt.append(SALTCHARS.substring(index, index + 1));
-        }
-
-        return MD5Crypt.apacheCrypt(password, salt.toString());
-    }
-
-    /**
-     * <p>This method actually generates an Apache MD5 compatible
-     * md5-encoded password hash from a plaintext password and a
-     * salt.</p>
-     *
-     * <p>The resulting string will be in the form '$apr1$&lt;salt&gt;$&lt;hashed mess&gt;</p>
-     *
-     * @param password Plaintext password
-     * @param salt A short string to use to randomize md5.  May start with $apr1$, which
-     *             will be ignored.  It is explicitly permitted to pass a pre-existing
-     *             MD5Crypt'ed password entry as the salt.  crypt() will strip the salt
-     *             chars out properly.
-     *
-     * @return An Apache-compatible md5-hashed password string.
-     */
-
-    static public final String apacheCrypt(String password, String salt) {
-        return MD5Crypt.crypt(password, salt, "$apr1$");
-    }
-
-    /**
-     * <p>This method actually generates md5-encoded password hash from
-     * a plaintext password, a salt, and a magic string.</p>
-     *
-     * <p>There are two magic strings that make sense to use here.. '$1$' is the
-     * magic string used by the FreeBSD/Linux/OpenBSD MD5Crypt algorithm, and
-     * '$apr1$' is the magic string used by the Apache MD5Crypt algorithm.</p>
-     *
-     * <p>The resulting string will be in the form '&lt;magic&gt;&lt;salt&gt;$&lt;hashed mess&gt;</p>
-     *
-     * @param password Plaintext password @param salt A short string to
-     * use to randomize md5.  May start with the magic string, which
-     * will be ignored.  It is explicitly permitted to pass a
-     * pre-existing MD5Crypt'ed password entry as the salt.  crypt()
-     * will strip the salt chars out properly.
-     * 
-     * @return An md5-hashed password string. 
-     */
-
-    static public final String crypt(String password, String salt,
-            String magic) {
-        /* This string is magic for this algorithm.  Having it this way,
-         * we can get get better later on */
-
-        byte finalState[];
-        MD5 ctx, ctx1;
-        long l;
-
-        /* -- */
-
-        /* Refine the Salt first */
-
-        /* If it starts with the magic string, then skip that */
-
-        if (salt.startsWith(magic)) {
-            salt = salt.substring(magic.length());
-        }
-
-        /* It stops at the first '$', max 8 chars */
-
-        if (salt.indexOf('$') != -1) {
-            salt = salt.substring(0, salt.indexOf('$'));
-        }
-
-        if (salt.length() > 8) {
-            salt = salt.substring(0, 8);
-        }
-
-        ctx = new MD5();
-
-        ctx.Update(password); // The password first, since that is what is most unknown
-        ctx.Update(magic); // Then our magic string
-        ctx.Update(salt); // Then the raw salt
-
-        /* Then just as many characters of the MD5(pw,salt,pw) */
-
-        ctx1 = new MD5();
-        ctx1.Update(password);
-        ctx1.Update(salt);
-        ctx1.Update(password);
-        finalState = ctx1.Final();
-
-        for (int pl = password.length(); pl > 0; pl -= 16) {
-            ctx.Update(finalState, pl > 16 ? 16 : pl);
-        }
-
-        /* the original code claimed that finalState was being cleared
-           to keep dangerous bits out of memory, but doing this is also
-           required in order to get the right output. */
-
-        clearbits(finalState);
-
-        /* Then something really weird... */
-
-        for (int i = password.length(); i != 0; i >>>= 1) {
-            if ((i & 1) != 0) {
-                ctx.Update(finalState, 1);
-            } else {
-                ctx.Update(password.getBytes(), 1);
-            }
-        }
-
-        finalState = ctx.Final();
-
-        /*
-         * and now, just to make sure things don't run too fast
-         * On a 60 Mhz Pentium this takes 34 msec, so you would
-         * need 30 seconds to build a 1000 entry dictionary...
-         *
-         * (The above timings from the C version)
-         */
-
-        for (int i = 0; i < 1000; i++) {
-            ctx1 = new MD5();
-
-            if ((i & 1) != 0) {
-                ctx1.Update(password);
-            } else {
-                ctx1.Update(finalState, 16);
-            }
-
-            if ((i % 3) != 0) {
-                ctx1.Update(salt);
-            }
-
-            if ((i % 7) != 0) {
-                ctx1.Update(password);
-            }
-
-            if ((i & 1) != 0) {
-                ctx1.Update(finalState, 16);
-            } else {
-                ctx1.Update(password);
-            }
-
-            finalState = ctx1.Final();
-        }
-
-        /* Now make the output string */
-
-        StringBuffer result = new StringBuffer();
-
-        result.append(magic);
-        result.append(salt);
-        result.append("$");
-
-        l = (bytes2u(finalState[0]) << 16)
-                | (bytes2u(finalState[6]) << 8)
-                | bytes2u(finalState[12]);
-        result.append(to64(l, 4));
-
-        l = (bytes2u(finalState[1]) << 16)
-                | (bytes2u(finalState[7]) << 8)
-                | bytes2u(finalState[13]);
-        result.append(to64(l, 4));
-
-        l = (bytes2u(finalState[2]) << 16)
-                | (bytes2u(finalState[8]) << 8)
-                | bytes2u(finalState[14]);
-        result.append(to64(l, 4));
-
-        l = (bytes2u(finalState[3]) << 16)
-                | (bytes2u(finalState[9]) << 8)
-                | bytes2u(finalState[15]);
-        result.append(to64(l, 4));
-
-        l = (bytes2u(finalState[4]) << 16)
-                | (bytes2u(finalState[10]) << 8)
-                | bytes2u(finalState[5]);
-        result.append(to64(l, 4));
-
-        l = bytes2u(finalState[11]);
-        result.append(to64(l, 2));
-
-        /* Don't leave anything around in vm they could use. */
-        clearbits(finalState);
-
-        return result.toString();
-    }
-}
-
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ProcessUtil.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ProcessUtil.java
deleted file mode 100644
index 87c74cf0..00000000
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ProcessUtil.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
- *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- *******************************************************************************/
-package com.gluster.storage.management.core.utils;
-
-import static com.gluster.storage.management.core.constants.CoreConstants.NEWLINE;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-
-/**
- * Utility class for creating processes (foreground/background) with given
- * command and checking the output/exit status
- */
-public class ProcessUtil {
-
-    public static ProcessResult executeCommand(List<String> command) {
-        return executeCommand(true, command);
-    }
-
-	/**
-	 * Waits till all the threads in given list are dead
-	 * @param threads Threads to watch
-	 * @throws InterruptedException
-	 */
-	public static void waitForThreads(List<Thread> threads) throws InterruptedException {
-		// Wait till all servers have been processed
-		for (int i = threads.size() - 1; i >= 0; i--) {
-			if (threads.get(i).isAlive()) {
-				// thread alive. sleep for half a second and check again.
-				Thread.sleep(500);
-				i++; // check the same thread in next iteration
-			}
-		}
-	}
-
-    /**
-     * Executes given command in a separate process in FOREGROUND
-     * @param command
-     * @return {@link ProcessResult} object
-     */
-    public static ProcessResult executeCommand(String... command) {
-        ArrayList<String> commandList = new ArrayList<String>();
-        for (String part : command) {
-            commandList.add(part);
-        }
-        return executeCommand(commandList);
-    }
-
-    /**
-     * Executes given command in foreground/background
-     * @param runInForeground Boolean flag indicating whether the command should
-     * be executed in foreground
-     * @param command
-     * @return {@link ProcessResult} object
-     */
-    public static ProcessResult executeCommand(boolean runInForeground, List<String> command) {
-        StringBuilder output = new StringBuilder();
-        try {
-            Process process = new ProcessBuilder(command).redirectErrorStream(true).start();
-            if (runInForeground) {
-                process.waitFor();      // Wait for process to finish
-
-                InputStream is = process.getInputStream();
-                InputStreamReader isr = new InputStreamReader(is);
-                BufferedReader br = new BufferedReader(isr);
-                String line;
-
-                while ((line = br.readLine()) != null) {
-                    output.append(line);
-                    output.append(NEWLINE);
-                }
-                br.close();
-                isr.close();
-                is.close();
-            } else {
-                output.append("Command [");
-                output.append(command);
-                output.append("] triggerred in background.");
-            }
-
-            return new ProcessResult(process.exitValue(), output.toString());
-        } catch (Throwable e) {
-			throw new GlusterRuntimeException("Exception while executing command [" + command + "] : ["
-					+ e.getMessage() + "]", e);
-        }
-    }
-}
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/format_device.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/format_device.py
deleted file mode 100755
index 8ae00260..00000000
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/format_device.py
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/python
-#  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Storage Platform.
-#
-
-import os
-import sys
-p1 = os.path.abspath(os.path.dirname(sys.argv[0]))
-p2 = "%s/common" % os.path.dirname(p1)
-if not p1 in sys.path:
-    sys.path.append(p1)
-if not p2 in sys.path:
-    sys.path.append(p2)
-import Globals
-import Utils
-import DiskUtils
-from optparse import OptionParser
-
-
-def main():
-    if Utils.runCommand("wget -t 1 -T 1 -q -O /dev/null %s" % Globals.AWS_WEB_SERVICE_URL) == 0:
-        sys.stderr.write("format device unsupported")
-        sys.exit(1)
-
-    parser = OptionParser()
-    parser.add_option("-t", "--type", action="store", type="string", dest="fstype")
-    (options, args) = parser.parse_args()
-
-    if len(args) != 1:
-        sys.stderr.write("usage: %s [-t FSTYPE] DEVICE_NAME\n" % os.path.basename(sys.argv[0]))
-        sys.exit(-1)
-
-    device = DiskUtils.getDevice(args[0])
-    deviceFormatLockFile = Utils.getDeviceFormatLockFile(device)
-    deviceFormatStatusFile = Utils.getDeviceFormatStatusFile(device)
-    deviceFormatOutputFile = Utils.getDeviceFormatOutputFile(device)
-
-    if DiskUtils.isDataDiskPartitionFormatted(device):
-        sys.stderr.write("Device already formatted\n")
-        sys.exit(2)
-
-    if os.path.exists(deviceFormatStatusFile):
-        Utils.log("format status file %s exists" % deviceFormatStatusFile)
-        line = Utils.readFile(deviceFormatStatusFile)
-        if not line:
-            sys.stderr.write("failed to read format status file %s\n" % deviceFormatStatusFile)
-            sys.exit(-2)
-        if line.strip().upper() == "COMPLETED":
-            sys.stderr.write("Device already formatted\n")
-            sys.exit(3)
-        else:
-            sys.stderr.write("Device format already running\n")
-            sys.exit(4)
-
-    if os.path.exists(deviceFormatLockFile):
-        Utils.log("lock file %s exists" % deviceFormatLockFile)
-        sys.stderr.write("Device format already running\n")
-        sys.exit(5)
-
-    if options.fstype:
-        command = ["%s/gluster_provision_block_wrapper.py" % p1, "-t", "%s" % (options.fstype), "%s" % (device)]
-    else:
-        command = ["%s/gluster_provision_block_wrapper.py" % p1, "%s" % (device)]
-
-    try:
-        pid = os.fork()
-    except OSError, e:
-        Utils.log("failed to fork a child process: %s" % str(e))
-        sys.exit(6)
-    if pid == 0:
-        os.execv(command[0], command)
-    sys.exit(0)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_status.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_status.py
deleted file mode 100755
index 2814f10f..00000000
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_status.py
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/python
-#  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Console.
-#
-
-import os
-import sys
-p1 = os.path.abspath(os.path.dirname(sys.argv[0]))
-p2 = "%s/common" % os.path.dirname(p1)
-if not p1 in sys.path:
-    sys.path.append(p1)
-if not p2 in sys.path:
-    sys.path.append(p2)
-import Utils
-
-def main():
-    if len(sys.argv) != 1:
-        sys.stderr.write("usage: %s\n" % os.path.basename(sys.argv[0]))
-        sys.exit(-1)
-
-    if Utils.runCommand("pidof glusterd") == 0:
-        print "ONLINE"
-    else:
-        print "OFFLINE"
-    sys.exit(0)
-
-if __name__ == "__main__":
-    main()
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster-volume-settings.init.d b/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster-volume-settings.init.d
deleted file mode 100755
index 97bc01ee..00000000
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster-volume-settings.init.d
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-#
-# chkconfig: - 90 10
-### BEGIN INIT INFO
-# Required-Start: $network syslog glusterd
-# Default-Start:  3 5
-# Description: Setup/cleanup CIFS settings of Gluster volumes
-### END INIT INFO
-
-case "$1" in
-    start)
-	modprobe -q fuse
-	sleep 3
-	if ! lsmod | grep -qw fuse; then
-	    echo "FATAL: fuse kernel module is not found.  Gluster CIFS volume access will not work" >&2
-	    exit 1
-	fi
-	/usr/sbin/gluster_cifs_volume_startup
-	;;
-esac
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster_provision_block_wrapper.py b/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster_provision_block_wrapper.py
deleted file mode 100755
index a2827ea2..00000000
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster_provision_block_wrapper.py
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/usr/bin/python
-#  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Storage Platform.
-#
-
-import os
-import sys
-p1 = os.path.abspath(os.path.dirname(sys.argv[0]))
-p2 = "%s/common" % os.path.dirname(p1)
-if not p1 in sys.path:
-    sys.path.append(p1)
-if not p2 in sys.path:
-    sys.path.append(p2)
-import subprocess
-import Utils
-from optparse import OptionParser
-
-def writeStatus(deviceFormatStatusFile, message):
-    try:
-        fp = open(deviceFormatStatusFile, "w")
-        fp.write(message)
-        fp.close()
-    except IOError, e:
-        Utils.log("Failed to update log file %s: %s" % (deviceFormatStatusFile, str(e)))
-        return False
-    return True
-
-
-def main():
-    parser = OptionParser()
-    parser.add_option("-t", "--type", action="store", type="string", dest="fstype")
-    (options, args) = parser.parse_args()
-
-    if len(args) != 1:
-        sys.stderr.write("usage: %s [-t FSTYPE] DEVICE" % os.path.basename(sys.argv[0]))
-        sys.exit(-1)
-
-    device = args[0]
-    deviceFormatLockFile = Utils.getDeviceFormatLockFile(device)
-    deviceFormatStatusFile = Utils.getDeviceFormatStatusFile(device)
-    deviceFormatOutputFile = Utils.getDeviceFormatOutputFile(device)
-
-    if os.path.exists(deviceFormatStatusFile):
-        Utils.log("device format status file %s exists" % deviceFormatStatusFile)
-        sys.exit(1)
-
-    if os.path.exists(deviceFormatLockFile):
-        Utils.log("device format lock file %s exists" % deviceFormatLockFile)
-        sys.exit(2)
-
-    try:
-        fp = open(deviceFormatLockFile, "w")
-        fp.close()
-    except OSError, e:
-        Utils.log("failed to create lock file %s: %s" % (deviceFormatLockFile, str(e)))
-        writeStatus(deviceFormatStatusFile, "Lock file creation failed\n")
-        sys.exit(3)
-
-    try:
-        fptr = open(deviceFormatOutputFile, 'w')
-    except IOError, e:
-        Utils.log("failed to create output file %s" % deviceFormatOutputFile)
-        writeStatus(deviceFormatStatusFile, "Output file creation failed\n")
-        Utils.removeFile(deviceFormatLockFile)
-        sys.exit(4)
-
-    if options.fstype:
-        command = "gluster-provision-block -t %s %s" % (options.fstype, device)
-    else:
-        command = "gluster-provision-block %s" % (device)
-
-    process = Utils.runCommandBG(command,
-                                 stdinFileObj=subprocess.PIPE,
-                                 stdoutFileObj=fptr,
-                                 stderrFileObj=subprocess.PIPE)
-    if process:
-        status = process.wait()
-    else:
-        Utils.removeFile(deviceFormatOutputFile)
-        Utils.removeFile(deviceFormatLockFile)
-        writeStatus(deviceFormatStatusFile, "Device format failed\n")
-        sys.exit(5)
-
-    if status != 0:
-        Utils.removeFile(deviceFormatOutputFile)
-        Utils.removeFile(deviceFormatLockFile)
-        writeStatus(deviceFormatStatusFile, "Device format failed\n")
-        sys.exit(6)
-
-    if Utils.runCommand("/sbin/udevtrigger") != 0:
-        Utils.log("failed running /sbin/udevtrigger")
-
-    if Utils.runCommand("/usr/bin/lshal") != 0:
-        Utils.log("failed running /usr/bin/lshal")
-    writeStatus(deviceFormatStatusFile, "Completed\n")
-    Utils.removeFile(deviceFormatOutputFile)
-    Utils.removeFile(deviceFormatLockFile)
-    sys.exit(0)
-
-if __name__ == "__main__":
-    main()
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/update-rrd.sh b/src/com.gluster.storage.management.gateway.scripts/src/backend/update-rrd.sh
deleted file mode 100755
index b081d6db..00000000
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/update-rrd.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-/usr/bin/rrd_cpu.pl &
-/usr/bin/rrd_mem.pl &
-/usr/bin/rrd_net.pl &
-wait
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/gmg-reset-password.sh b/src/com.gluster.storage.management.gateway.scripts/src/gateway/gmg-reset-password.sh
deleted file mode 100755
index 6c7ac998..00000000
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/gmg-reset-password.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#-----------------------------------------------------------------------------------
-# gmg-reset-password.sh - script to reset password of given user to default password
-#-----------------------------------------------------------------------------------
-
-USAGE_ERR=1
-
-if [ $# -ne 1 ]; then
-	echo "Usage: ${0} <username>"
-	echo
-	exit ${USAGE_ERR}
-fi
-
-CURR_DIR=${PWD}
-SCRIPT_PATH=`readlink -f ${0}`
-GLUSTERMG_DIR=`dirname ${SCRIPT_PATH}`
-
-# Main action body
-cd ${GLUSTERMG_DIR}
-cd ..
-for FILE in WEB-INF/lib/*.jar
-do
-	export CLASSPATH=${CLASSPATH}:${PWD}/${FILE}
-done
-export CLASSPATH=${PWD}/WEB-INF/classes:${CLASSPATH}
-cd ${CURR_DIR}
-java com.gluster.storage.management.gateway.utils.PasswordManager reset ${1}
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/grun.py b/src/com.gluster.storage.management.gateway.scripts/src/gateway/grun.py
deleted file mode 100755
index 6519d726..00000000
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/grun.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/python
-#  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
-#
-
-import os
-import sys
-p1 = os.path.abspath(os.path.dirname(sys.argv[0]))
-p2 = "%s/common" % os.path.dirname(p1)
-if not p1 in sys.path:
-    sys.path.append(p1)
-if not p2 in sys.path:
-    sys.path.append(p2)
-import Utils
-
-
-if len(sys.argv) < 3:
-    sys.stderr.write("usage: %s SERVER_FILE COMMAND [ARGUMENTS]\n" % os.path.basename(sys.argv[0]))
-    sys.exit(-1)
-
-sys.exit(Utils.grun(sys.argv[1], sys.argv[2], sys.argv[3:]))
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/setup_cifs_config_all.py b/src/com.gluster.storage.management.gateway.scripts/src/gateway/setup_cifs_config_all.py
deleted file mode 100755
index e7e0a4a0..00000000
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/setup_cifs_config_all.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/python
-#  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
-#
-
-import os
-import sys
-p1 = os.path.abspath(os.path.dirname(sys.argv[0]))
-p2 = "%s/common" % os.path.dirname(p1)
-if not p1 in sys.path:
-    sys.path.append(p1)
-if not p2 in sys.path:
-    sys.path.append(p2)
-import Utils
-
-
-def main():
-    if len(sys.argv) < 2:
-        sys.stderr.write("usage: %s SERVER_FILE\n" % os.path.basename(sys.argv[0]))
-        sys.exit(-1)
-
-    serverFile = sys.argv[1]
-
-    rv = Utils.grun(serverFile, "setup_cifs_config.py")
-    sys.exit(rv)
-
-
-if __name__ == "__main__":
-    main()
diff --git a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.component b/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 3d5a50bf..00000000
--- a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="com.gluster.storage.management.gateway">
-        <wb-resource deploy-path="/" source-path="/WebContent"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/junit"/>
-        <property name="java-output-path" value="/com.gluster.storage.management.gateway/build/classes"/>
-        <property name="context-root" value="glustermg"/>
-    </wb-module>
-</project-modules>
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/Globals.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/Globals.py
deleted file mode 120000
index 7d230498..00000000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/Globals.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../com.gluster.storage.management.gateway.scripts/src/common/Globals.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/Protocol.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/Protocol.py
deleted file mode 120000
index 7ecad84d..00000000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/Protocol.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../com.gluster.storage.management.gateway.scripts/src/common/Protocol.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py
deleted file mode 120000
index df26ff44..00000000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/Utils.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../com.gluster.storage.management.gateway.scripts/src/common/Utils.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/XmlHandler.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/XmlHandler.py
deleted file mode 120000
index 880349a1..00000000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/XmlHandler.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../com.gluster.storage.management.gateway.scripts/src/common/XmlHandler.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py
deleted file mode 120000
index fec57917..00000000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../com.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py
deleted file mode 120000
index 03752d57..00000000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../com.gluster.storage.management.gateway.scripts/src/gateway/create_volume_cifs_all.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_user_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_user_cifs_all.py
deleted file mode 120000
index d517e46c..00000000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_user_cifs_all.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../com.gluster.storage.management.gateway.scripts/src/gateway/delete_user_cifs_all.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py
deleted file mode 120000
index be9e627c..00000000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../com.gluster.storage.management.gateway.scripts/src/gateway/delete_volume_cifs_all.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/get_volume_user_cifs.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/get_volume_user_cifs.py
deleted file mode 120000
index 3eff03fd..00000000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/get_volume_user_cifs.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../com.gluster.storage.management.gateway.scripts/src/gateway/get_volume_user_cifs.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/gmg-reset-password.sh b/src/com.gluster.storage.management.gateway/WebContent/scripts/gmg-reset-password.sh
deleted file mode 120000
index 13b9a40b..00000000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/gmg-reset-password.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../com.gluster.storage.management.gateway.scripts/src/gateway/gmg-reset-password.sh
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/grun.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/grun.py
deleted file mode 120000
index 5e56bfbb..00000000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/grun.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../com.gluster.storage.management.gateway.scripts/src/gateway/grun.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/multicast-discover-servers.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/multicast-discover-servers.py
deleted file mode 120000
index 6288f182..00000000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/multicast-discover-servers.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../com.gluster.storage.management.gateway.scripts/src/gateway/multicast-discover-servers.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/remove_server_volume_cifs_config.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/remove_server_volume_cifs_config.py
deleted file mode 120000
index 32d1dec4..00000000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/remove_server_volume_cifs_config.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../com.gluster.storage.management.gateway.scripts/src/gateway/remove_server_volume_cifs_config.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/setup_cifs_config_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/setup_cifs_config_all.py
deleted file mode 120000
index e3f44800..00000000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/setup_cifs_config_all.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../com.gluster.storage.management.gateway.scripts/src/gateway/setup_cifs_config_all.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py b/src/com.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py
deleted file mode 120000
index 8496fae4..00000000
--- a/src/com.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../com.gluster.storage.management.gateway.scripts/src/gateway/update_volume_cifs_all.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/src/META-INF/persistence.xml b/src/com.gluster.storage.management.gateway/src/META-INF/persistence.xml
deleted file mode 100644
index 36b252ea..00000000
--- a/src/com.gluster.storage.management.gateway/src/META-INF/persistence.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
-	<persistence-unit name="gluster-management-gateway" transaction-type="RESOURCE_LOCAL" />
-</persistence>
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/GlusterDataSource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/GlusterDataSource.java
deleted file mode 100644
index 0802fe93..00000000
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/GlusterDataSource.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * GlusterDataSource.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
- *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.gateway.data;
-
-import javax.servlet.ServletContext;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.datasource.DriverManagerDataSource;
-import org.springframework.stereotype.Component;
-
-@Component
-public class GlusterDataSource extends DriverManagerDataSource {
-	@Autowired
-	ServletContext servletContext;
-	
-	public GlusterDataSource() {
-		setDriverClassName(org.apache.derby.jdbc.EmbeddedDriver.class.getName());
-
-		setUsername("gluster");
-		// TODO: change to a stronger (encrypted) password
-		setPassword("gluster");
-	}
-
-	public DriverManagerDataSource getDataSource() {
-		// Database directory = work/data relative to context root
-		setUrl("jdbc:derby:" + servletContext.getRealPath("data") + ";create=true");
-		
-		return this;
-	}
-}
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/GlusterResourceFilterFactory.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/GlusterResourceFilterFactory.java
deleted file mode 100644
index 1c480f3f..00000000
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/GlusterResourceFilterFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * 
- */
-package com.gluster.storage.management.gateway.filters;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.sun.jersey.api.model.AbstractMethod;
-import com.sun.jersey.spi.container.ResourceFilter;
-import com.sun.jersey.spi.container.ResourceFilterFactory;
-
-/**
- * Gluster resource filter factory. As of now, this creates only one filter - the audit filter {@code AuditFilter}
- */
-public class GlusterResourceFilterFactory implements ResourceFilterFactory {
-
-	public GlusterResourceFilterFactory() {
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.sun.jersey.spi.container.ResourceFilterFactory#create(com.sun.jersey.api.model.AbstractMethod)
-	 */
-	@Override
-	public List<ResourceFilter> create(AbstractMethod arg0) {
-		List<ResourceFilter> filters = new ArrayList<ResourceFilter>();
-		filters.add(new AuditFilter());
-		
-		return filters;
-	}
-}
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/security/GlusterUserDetailsService.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/security/GlusterUserDetailsService.java
deleted file mode 100644
index e806051c..00000000
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/security/GlusterUserDetailsService.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * GlusterUserDetailsService.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
- *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.gateway.security;
-
-import org.springframework.security.core.userdetails.UserDetailsService;
-
-/**
- *
- */
-public interface GlusterUserDetailsService extends UserDetailsService {
-	void changePassword(String username, String password);
-}
-
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/AbstractGlusterInterface.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/AbstractGlusterInterface.java
deleted file mode 100644
index 93db0267..00000000
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/AbstractGlusterInterface.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
- *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- *******************************************************************************/
-package com.gluster.storage.management.gateway.services;
-
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.gluster.storage.management.gateway.utils.ServerUtil;
-
-/**
- * Abstract Gluster Interface - provides functionality common across all versions of GlusterFS e.g. version check.
- */
-public abstract class AbstractGlusterInterface implements GlusterInterface {
-	
-	@Autowired
-	protected ServerUtil serverUtil;
-
-	@Override
-	public String getVersion(String serverName) {
-		return serverUtil.executeOnServer(serverName, "gluster --version").split("\n")[0].replaceAll("glusterfs ", "")
-				.replaceAll(" built.*", "");
-	}
-}
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/CpuStatsFactory.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/CpuStatsFactory.java
deleted file mode 100644
index b6ef9ef2..00000000
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/CpuStatsFactory.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
- *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- *******************************************************************************/
-package com.gluster.storage.management.gateway.utils;
-
-import org.springframework.stereotype.Component;
-
-/**
- *
- */
-@Component
-public class CpuStatsFactory extends AbstractStatsFactory {
-	
-	private static final String CPU_STATS_SCRIPT = "get_rrd_cpu_details.py";
-
-	@Override
-	public String getStatsScriptName() {
-		return CPU_STATS_SCRIPT;
-	}
-	
-}
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/StatsFactory.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/StatsFactory.java
deleted file mode 100644
index 09851367..00000000
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/StatsFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
- *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
- * <http://www.gnu.org/licenses/>.
- *******************************************************************************/
-package com.gluster.storage.management.gateway.utils;
-
-import java.util.List;
-
-import com.gluster.storage.management.core.model.ServerStats;
-
-/**
- *
- */
-public interface StatsFactory {
-	public ServerStats fetchStats(String serverName, String period, String...args);
-	public ServerStats fetchAggregatedStats(List<String> serverName, String period);
-}
diff --git a/src/com.gluster.storage.management.gateway/src/log4j.properties b/src/com.gluster.storage.management.gateway/src/log4j.properties
deleted file mode 100644
index bde9e66f..00000000
--- a/src/com.gluster.storage.management.gateway/src/log4j.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-log4j.rootLogger=INFO, R
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.immediateFlush=true
-log4j.appender.CONSOLE.target=System.out
-log4j.appender.CONSOLE.threshold=DEBUG
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{dd MMM, yyyy HH:mm:ss} %p: %c %t - %m%n
-
-log4j.appender.R=org.apache.log4j.RollingFileAppender 
-log4j.appender.R.File=/var/log/glustermg/glustermg.log 
-log4j.appender.R.MaxFileSize=10MB 
-log4j.appender.R.MaxBackupIndex=10 
-log4j.appender.R.layout=org.apache.log4j.PatternLayout
-log4j.appender.R.layout.ConversionPattern=%d{dd MMM, yyyy HH:mm:ss} %p: %c %t - %m%n 
-#log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n
-
-log4j.logger.org=ERROR
-log4j.logger.com=ERROR
-log4j.logger.com.gluster=DEBUG
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/src/rebel.xml b/src/com.gluster.storage.management.gateway/src/rebel.xml
deleted file mode 100644
index 0f2140c9..00000000
--- a/src/com.gluster.storage.management.gateway/src/rebel.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://www.zeroturnaround.com/alderaan/rebel-2_0.xsd">
-
-	<classpath>
-		<dir name="${rebel.workspace.path}/console/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/classes">
-		</dir>
-	</classpath>
-
-	<web>
-		<link target="/">
-			<dir name="${rebel.workspace.path}/console/src/com.gluster.storage.management.gateway/WebContent">
-			</dir>
-		</link>
-	</web>
-
-</application>
diff --git a/src/com.gluster.storage.management.releng/build.properties b/src/com.gluster.storage.management.releng/build.properties
deleted file mode 100644
index 64f93a9f..00000000
--- a/src/com.gluster.storage.management.releng/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/src/com.gluster.storage.management.releng/com.gluster.storage.management.client.cquery b/src/com.gluster.storage.management.releng/com.gluster.storage.management.client.cquery
deleted file mode 100644
index 7bb4b868..00000000
--- a/src/com.gluster.storage.management.releng/com.gluster.storage.management.client.cquery
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cq:componentQuery xmlns:cq="http://www.eclipse.org/buckminster/CQuery-1.0" resourceMap="glustermc.rmap">
-    <cq:rootRequest name="com.gluster.storage.management.core" componentType="osgi.bundle"/>
-</cq:componentQuery>
diff --git a/src/com.gluster.storage.management.releng/feature.xml b/src/com.gluster.storage.management.releng/feature.xml
deleted file mode 100644
index 22a0938f..00000000
--- a/src/com.gluster.storage.management.releng/feature.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="com.gluster.storage.management.releng"
-      label="Releng"
-      version="1.0.0"
-      provider-name="Gluster Inc.">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-</feature>
diff --git a/src/com.gluster.storage.management.releng/gluster-management-console.target b/src/com.gluster.storage.management.releng/gluster-management-console.target
deleted file mode 100644
index 3fcae362..00000000
--- a/src/com.gluster.storage.management.releng/gluster-management-console.target
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.6"?>
-
-<target includeMode="feature" name="Gluster Storage Platform Target">
-<locations>
-<location path="target/com.gluster.storage.management.console.target/richclientgui.rcptoolbox" type="Directory"/>
-<location path="target/com.gluster.storage.management.console.target/org.eclipse.tm.terminal" type="Directory"/>
-<location path="target/com.gluster.storage.management.console.target/rcp.sdk.indigo" type="Directory"/>
-<location path="target/com.gluster.storage.management.console.target/birt.charts.indigo" type="Directory"/>
-<location path="target/com.gluster.storage.management.console.target/delta.pack.indigo" type="Directory"/>
-</locations>
-<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-</target>
diff --git a/src/com.gluster.storage.management.client/.classpath b/src/org.gluster.storage.management.client/.classpath
index d81daeeb..9e3c9ce6 100644
--- a/src/com.gluster.storage.management.client/.classpath
+++ b/src/org.gluster.storage.management.client/.classpath
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry exported="true" kind="lib" path="lib/jersey-1.5/jersey-multipart-1.5.jar"/>
-	<classpathentry exported="true" kind="lib" path="keystore/"/>
 	<classpathentry exported="true" kind="lib" path="lib/jersey-1.5/jersey-client-1.5.jar" sourcepath="/data/downloads/sun/jersey/sources/jersey-client-1.5-sources.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jersey-1.5/jersey-core-1.5.jar" sourcepath="/home/selvam/sources/jersey/jersey-core-1.5-sources.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry excluding="keystore/" kind="src" path="src"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/com.gluster.storage.management.core"/>
+	<classpathentry kind="src" path="keystore"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.gluster.storage.management.core"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/src/com.gluster.storage.management.client/.project b/src/org.gluster.storage.management.client/.project
index 61a0ec41..e8da4675 100644
--- a/src/com.gluster.storage.management.client/.project
+++ b/src/org.gluster.storage.management.client/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.client</name>
+	<name>org.gluster.storage.management.client</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.client/.settings/org.eclipse.jdt.core.prefs b/src/org.gluster.storage.management.client/.settings/org.eclipse.jdt.core.prefs
index f8b5cc38..f8b5cc38 100644
--- a/src/com.gluster.storage.management.client/.settings/org.eclipse.jdt.core.prefs
+++ b/src/org.gluster.storage.management.client/.settings/org.eclipse.jdt.core.prefs
diff --git a/src/com.gluster.storage.management.client/META-INF/MANIFEST.MF b/src/org.gluster.storage.management.client/META-INF/MANIFEST.MF
index 7958d8cd..0b7ada61 100644
--- a/src/com.gluster.storage.management.client/META-INF/MANIFEST.MF
+++ b/src/org.gluster.storage.management.client/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Gluster Storage Platform Client
-Bundle-SymbolicName: com.gluster.storage.management.client
-Bundle-Version: 1.0.0
-Bundle-Vendor: GLUSTER
+Bundle-SymbolicName: org.gluster.storage.management.client
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: Gluster
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Require-Bundle: com.gluster.storage.management.core;bundle-version="1.0.0",
+Require-Bundle: org.gluster.storage.management.core;bundle-version="1.0.0",
  org.eclipse.equinox.common;bundle-version="3.6.0"
-Export-Package: com.gluster.storage.management.client,
- com.gluster.storage.management.client.constants
+Export-Package: org.gluster.storage.management.client,
+ org.gluster.storage.management.client.constants
 Bundle-ClassPath: .,
  lib/jersey-1.5/jersey-client-1.5.jar,
  lib/jersey-1.5/jersey-core-1.5.jar,
diff --git a/src/org.gluster.storage.management.client/build.properties b/src/org.gluster.storage.management.client/build.properties
new file mode 100644
index 00000000..fe37f4ee
--- /dev/null
+++ b/src/org.gluster.storage.management.client/build.properties
@@ -0,0 +1,27 @@
+###############################################################################
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Console.
+#
+# Gluster Management Console 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.
+#
+# Gluster Management Console 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/>.
+###############################################################################
+source.. = src/,\
+           keystore/
+output.. = bin/
+bin.includes = .,\
+               META-INF/,\
+               lib/,\
+               keystore/,\
+               lib/jersey-1.5/jersey-multipart-1.5.jar
+src.includes = lib/
diff --git a/src/com.gluster.storage.management.client/keystore/gmc-trusted.keystore b/src/org.gluster.storage.management.client/keystore/gmc-trusted.keystore
index 5517b6e5..5517b6e5 100644
--- a/src/com.gluster.storage.management.client/keystore/gmc-trusted.keystore
+++ b/src/org.gluster.storage.management.client/keystore/gmc-trusted.keystore
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/Jersey-LICENSE.txt b/src/org.gluster.storage.management.client/lib/jersey-1.5/Jersey-LICENSE.txt
index d24fbfdb..d24fbfdb 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/Jersey-LICENSE.txt
+++ b/src/org.gluster.storage.management.client/lib/jersey-1.5/Jersey-LICENSE.txt
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/Jersey-third-party-license-readme.txt b/src/org.gluster.storage.management.client/lib/jersey-1.5/Jersey-third-party-license-readme.txt
index b3acf520..b3acf520 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/Jersey-third-party-license-readme.txt
+++ b/src/org.gluster.storage.management.client/lib/jersey-1.5/Jersey-third-party-license-readme.txt
diff --git a/src/com.gluster.storage.management.client/lib/jersey-1.5/jersey-client-1.5.jar b/src/org.gluster.storage.management.client/lib/jersey-1.5/jersey-client-1.5.jar
index 62f790fa..62f790fa 100644
--- a/src/com.gluster.storage.management.client/lib/jersey-1.5/jersey-client-1.5.jar
+++ b/src/org.gluster.storage.management.client/lib/jersey-1.5/jersey-client-1.5.jar
diff --git a/src/com.gluster.storage.management.client/lib/jersey-1.5/jersey-core-1.5.jar b/src/org.gluster.storage.management.client/lib/jersey-1.5/jersey-core-1.5.jar
index 92b38466..92b38466 100644
--- a/src/com.gluster.storage.management.client/lib/jersey-1.5/jersey-core-1.5.jar
+++ b/src/org.gluster.storage.management.client/lib/jersey-1.5/jersey-core-1.5.jar
diff --git a/src/com.gluster.storage.management.client/lib/jersey-1.5/jersey-multipart-1.5.jar b/src/org.gluster.storage.management.client/lib/jersey-1.5/jersey-multipart-1.5.jar
index 1c134f05..1c134f05 100644
--- a/src/com.gluster.storage.management.client/lib/jersey-1.5/jersey-multipart-1.5.jar
+++ b/src/org.gluster.storage.management.client/lib/jersey-1.5/jersey-multipart-1.5.jar
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/AbstractClient.java
index a77e2a31..c433c3f4 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/AbstractClient.java
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/AbstractClient.java
@@ -1,428 +1,447 @@
-package com.gluster.storage.management.client;

-

-import static com.gluster.storage.management.client.constants.ClientConstants.ALGORITHM_SUNX509;

-import static com.gluster.storage.management.client.constants.ClientConstants.KEYSTORE_TYPE_JKS;

-import static com.gluster.storage.management.client.constants.ClientConstants.PROTOCOL_TLS;

-import static com.gluster.storage.management.client.constants.ClientConstants.TRUSTED_KEYSTORE;

-import static com.gluster.storage.management.client.constants.ClientConstants.TRUSTED_KEYSTORE_ACCESS;

-

-import java.io.FileOutputStream;

-import java.io.IOException;

-import java.io.InputStream;

-import java.net.ConnectException;

-import java.net.URI;

-import java.security.KeyStore;

-

-import javax.net.ssl.HostnameVerifier;

-import javax.net.ssl.KeyManagerFactory;

-import javax.net.ssl.SSLContext;

-import javax.net.ssl.SSLSession;

-import javax.net.ssl.TrustManagerFactory;

-import javax.ws.rs.core.MediaType;

-import javax.ws.rs.core.MultivaluedMap;

-import javax.ws.rs.core.Response;

-

-import com.gluster.storage.management.client.utils.ClientUtil;

-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;

-import com.sun.jersey.api.client.Client;

-import com.sun.jersey.api.client.ClientResponse;

-import com.sun.jersey.api.client.UniformInterfaceException;

-import com.sun.jersey.api.client.WebResource;

-import com.sun.jersey.api.client.WebResource.Builder;

-import com.sun.jersey.api.client.config.DefaultClientConfig;

-import com.sun.jersey.api.representation.Form;

-import com.sun.jersey.client.urlconnection.HTTPSProperties;

-import com.sun.jersey.core.util.MultivaluedMapImpl;

-import com.sun.jersey.multipart.FormDataMultiPart;

-

-public abstract class AbstractClient {

-	private static final String HTTP_HEADER_AUTH = "Authorization";

-	protected static final MultivaluedMap<String, String> NO_PARAMS = new MultivaluedMapImpl();

-	protected static String clusterName;

-	protected static String securityToken;

-	protected WebResource resource;

-	private String authHeader;

-	private Client client;

-

-	/**

-	 * This constructor will work only after the data model manager has been initialized.

-	 */

-	public AbstractClient() {

-		this(securityToken, clusterName);

-	}

-

-	/**

-	 * This constructor will work only after the data model manager has been initialized.

-	 */

-	public AbstractClient(String clusterName) {

-		this(securityToken, clusterName);

-	}

-

-	public AbstractClient(String securityToken, String clusterName) {

-		AbstractClient.clusterName = clusterName;

-		setSecurityToken(securityToken);

-

-		createClient();

-

-		// this must be after setting clusterName as sub-classes may refer to cluster name in the getResourcePath method

-		resource = client.resource(ClientUtil.getServerBaseURI()).path(getResourcePath());

-	}

-

-	private void createClient() {

-		SSLContext context = initializeSSLContext();

-		DefaultClientConfig config = createClientConfig(context);

-		client = Client.create(config);

-	}

-

-	private DefaultClientConfig createClientConfig(SSLContext context) {

-		DefaultClientConfig config = new DefaultClientConfig();

-		config.getProperties().put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES,

-				new HTTPSProperties(createHostnameVerifier(), context));

-		return config;

-	}

-

-	private HostnameVerifier createHostnameVerifier() {

-		HostnameVerifier hostnameVerifier = new HostnameVerifier() {

-			@Override

-			public boolean verify(String arg0, SSLSession arg1) {

-				return true;

-			}

-		};

-		return hostnameVerifier;

-	}

-

-	private SSLContext initializeSSLContext() {

-		SSLContext context = null;

-		try {

-			context = SSLContext.getInstance(PROTOCOL_TLS);

-

-			KeyStore keyStore = KeyStore.getInstance(KEYSTORE_TYPE_JKS);

-			keyStore.load(loadResource(TRUSTED_KEYSTORE), TRUSTED_KEYSTORE_ACCESS.toCharArray());

-

-			KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(ALGORITHM_SUNX509);

-			keyManagerFactory.init(keyStore, TRUSTED_KEYSTORE_ACCESS.toCharArray());

-

-			TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(ALGORITHM_SUNX509);

-			trustManagerFactory.init(keyStore);

-

-			context.init(keyManagerFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), null);

-		} catch (Exception e) {

-			throw new GlusterRuntimeException(

-					"Couldn't initialize SSL Context with Gluster Management Gateway! Error: " + e, e);

-		}

-		return context;

-	}

-

-	private InputStream loadResource(String resourcePath) {

-		return this.getClass().getClassLoader().getResourceAsStream(resourcePath);

-	}

-

-	/**

-	 * Fetches the given resource by dispatching a GET request

-	 * 

-	 * @param res

-	 *            Resource to be fetched

-	 * @param queryParams

-	 *            Query parameters to be sent for the GET request

-	 * @param responseClass

-	 *            Expected class of the response

-	 * @return Object of responseClass received as a result of the GET request

-	 */

-	private <T> T fetchResource(WebResource res, MultivaluedMap<String, String> queryParams, Class<T> responseClass) {

-		try {

-			return res.queryParams(queryParams).header(HTTP_HEADER_AUTH, authHeader).accept(MediaType.APPLICATION_XML)

-					.get(responseClass);

-		} catch (Exception e1) {

-			throw createGlusterException(e1);

-		}

-	}

-

-	private GlusterRuntimeException createGlusterException(Exception e) {

-		if (e instanceof GlusterRuntimeException) {

-			return (GlusterRuntimeException) e;

-		}

-

-		if (e instanceof UniformInterfaceException) {

-			UniformInterfaceException uie = (UniformInterfaceException) e;

-			if ((uie.getResponse().getStatus() == Response.Status.UNAUTHORIZED.getStatusCode())) {

-				// authentication failed. clear security token.

-				setSecurityToken(null);

-				return new GlusterRuntimeException("Invalid credentials!");

-			} else {

-				return new GlusterRuntimeException("[" + uie.getResponse().getStatus() + "]["

-						+ uie.getResponse().getEntity(String.class) + "]");

-			}

-		} else {

-			Throwable cause = e.getCause();

-			if (cause != null && cause instanceof ConnectException) {

-				return new GlusterRuntimeException("Couldn't connect to Gluster Management Gateway!");

-			}

-

-			return new GlusterRuntimeException("Exception in REST communication! [" + e.getMessage() + "]", e);

-		}

-	}

-

-	protected void downloadResource(WebResource res, String filePath) {

-		ClientResponse response = null;

-		try {

-			response = res.header(HTTP_HEADER_AUTH, authHeader).accept(MediaType.APPLICATION_OCTET_STREAM)

-				.get(ClientResponse.class);

-			checkResponseStatus(response);

-		} catch (Exception e1) {

-			throw createGlusterException(e1);

-		}

-		

-		try {

-			if (!response.hasEntity()) {

-				throw new GlusterRuntimeException("No entity in response!");

-			}

-

-			InputStream inputStream = response.getEntityInputStream();

-			FileOutputStream outputStream = new FileOutputStream(filePath);

-

-			int c;

-			while ((c = inputStream.read()) != -1) {

-				outputStream.write(c);

-			}

-			inputStream.close();

-			outputStream.close();

-		} catch (IOException e) {

-			throw new GlusterRuntimeException("Error while downloading resource [" + res.getURI().getPath() + "]", e);

-		}

-	}

-

-	public void uploadResource(WebResource res, FormDataMultiPart form) {

-		try {

-			res.header(HTTP_HEADER_AUTH, authHeader).type(MediaType.MULTIPART_FORM_DATA_TYPE).post(String.class, form);

-		} catch (Exception e) {

-			throw createGlusterException(e);

-		}

-	}

-

-	/**

-	 * Fetches the default resource (the one returned by {@link AbstractClient#getResourcePath()}) by dispatching a GET

-	 * request on the resource

-	 * 

-	 * @param queryParams

-	 *            Query parameters to be sent for the GET request

-	 * @param responseClass

-	 *            Expected class of the response

-	 * @return Object of responseClass received as a result of the GET request

-	 */

-	protected <T> T fetchResource(MultivaluedMap<String, String> queryParams, Class<T> responseClass) {

-		return fetchResource(resource, queryParams, responseClass);

-	}

-

-	/**

-	 * Fetches the default resource (the one returned by {@link AbstractClient#getResourcePath()}) by dispatching a GET

-	 * request on the resource

-	 * 

-	 * @param responseClass

-	 *            Expected class of the response

-	 * @return Object of responseClass received as a result of the GET request

-	 */

-	protected <T> T fetchResource(Class<T> responseClass) {

-		return fetchResource(resource, NO_PARAMS, responseClass);

-	}

-

-	/**

-	 * Fetches the resource whose name is arrived at by appending the "subResourceName" parameter to the default

-	 * resource (the one returned by {@link AbstractClient#getResourcePath()})

-	 * 

-	 * @param subResourceName

-	 *            Name of the sub-resource

-	 * @param responseClass

-	 *            Expected class of the response

-	 * @return Object of responseClass received as a result of the GET request on the sub-resource

-	 */

-	protected <T> T fetchSubResource(String subResourceName, Class<T> responseClass) {

-		return fetchResource(resource.path(subResourceName), NO_PARAMS, responseClass);

-	}

-

-	protected void downloadSubResource(String subResourceName, String filePath) {

-		downloadResource(resource.path(subResourceName), filePath);

-	}

-

-	/**

-	 * Fetches the resource whose name is arrived at by appending the "subResourceName" parameter to the default

-	 * resource (the one returned by {@link AbstractClient#getResourcePath()})

-	 * 

-	 * @param subResourceName

-	 *            Name of the sub-resource

-	 * @param queryParams

-	 *            Query parameters to be sent for the GET request

-	 * @param responseClass

-	 *            Expected class of the response

-	 * @return Object of responseClass received as a result of the GET request on the sub-resource

-	 */

-	protected <T> T fetchSubResource(String subResourceName, MultivaluedMap<String, String> queryParams,

-			Class<T> responseClass) {

-		return fetchResource(resource.path(subResourceName), queryParams, responseClass);

-	}

-

-	private ClientResponse postRequest(WebResource resource, Form form) {

-		try {

-			ClientResponse response = prepareFormRequestBuilder(resource).post(ClientResponse.class, form);

-			checkResponseStatus(response);

-			return response;

-		} catch (UniformInterfaceException e) {

-			throw new GlusterRuntimeException(e.getResponse().getEntity(String.class));

-		}

-	}

-

-	/**

-	 * Submits given object to the resource and returns the object received as response

-	 * 

-	 * @param responseClass

-	 *            Class of the object expected as response

-	 * @param requestObject

-	 *            the Object to be submitted

-	 * @return Object of given class received as response

-	 */

-	protected <T> T postObject(Class<T> responseClass, Object requestObject) {

-		return resource.type(MediaType.APPLICATION_XML).header(HTTP_HEADER_AUTH, authHeader)

-				.accept(MediaType.APPLICATION_XML).post(responseClass, requestObject);

-	}

-

-	/**

-	 * Submits given Form using POST method to the resource and returns the object received as response

-	 * 

-	 * @param form

-	 *            Form to be submitted

-	 */

-	protected URI postRequest(Form form) {

-		return postRequest(resource, form).getLocation();

-	}

-

-	/**

-	 * Submits given Form using POST method to the given sub-resource and returns the object received as response

-	 * 

-	 * @param subResourceName

-	 *            Name of the sub-resource to which the request is to be posted

-	 * @param form

-	 *            Form to be submitted

-	 */

-	protected void postRequest(String subResourceName, Form form) {

-		postRequest(resource.path(subResourceName), form);

-	}

-

-	private ClientResponse putRequest(WebResource resource, Form form) {

-		try {

-			ClientResponse response = prepareFormRequestBuilder(resource).put(ClientResponse.class, form);

-			checkResponseStatus(response);

-			return response;

-		} catch (Exception e) {

-			throw createGlusterException(e);

-		}

-	}

-

-	private void checkResponseStatus(ClientResponse response) {

-		if ((response.getStatus() == Response.Status.UNAUTHORIZED.getStatusCode())) {

-			// authentication failed. clear security token.

-			setSecurityToken(null);

-			throw new GlusterRuntimeException("Invalid credentials!");

-		}

-		if (response.getStatus() >= 300) {

-			throw new GlusterRuntimeException(response.getEntity(String.class));

-		}

-	}

-

-	public Builder prepareFormRequestBuilder(WebResource resource) {

-		return resource.type(MediaType.APPLICATION_FORM_URLENCODED_TYPE).header(HTTP_HEADER_AUTH, authHeader)

-				.accept(MediaType.APPLICATION_XML);

-	}

-

-	/**

-	 * Submits given Form using PUT method to the given sub-resource and returns the object received as response

-	 * 

-	 * @param subResourceName

-	 *            Name of the sub-resource to which the request is to be posted

-	 * @param form

-	 *            Form to be submitted

-	 */

-	protected void putRequest(String subResourceName, Form form) {

-		putRequest(resource.path(subResourceName), form);

-	}

-

-	protected URI putRequestURI(String subResourceName, Form form) {

-		ClientResponse response = putRequest(resource.path(subResourceName), form);

-		return response.getLocation();

-	}

-

-	/**

-	 * Submits given Form using PUT method to the given sub-resource and returns the object received as response

-	 * 

-	 * @param form

-	 *            Form to be submitted

-	 */

-	protected void putRequest(Form form) {

-		putRequest(resource, form);

-	}

-

-	/**

-	 * Submits given Form using PUT method to the given sub-resource and returns the object received as response

-	 * 

-	 * @param subResourceName

-	 *            Name of the sub-resource to which the request is to be posted

-	 */

-	protected void putRequest(String subResourceName) {

-		try {

-			prepareFormRequestBuilder(resource.path(subResourceName)).put();

-		} catch (UniformInterfaceException e) {

-			throw new GlusterRuntimeException(e.getResponse().getEntity(String.class));

-		}

-	}

-

-	private void deleteResource(WebResource resource, MultivaluedMap<String, String> queryParams) {

-		try {

-			resource.queryParams(queryParams).header(HTTP_HEADER_AUTH, authHeader).delete();

-		} catch (UniformInterfaceException e) {

-			throw new GlusterRuntimeException(e.getResponse().getEntity(String.class));

-		}

-	}

-

-	protected void deleteResource(MultivaluedMap<String, String> queryParams) {

-		deleteResource(resource, queryParams);

-	}

-

-	protected void deleteSubResource(String subResourceName, MultivaluedMap<String, String> queryParams) {

-		deleteResource(resource.path(subResourceName), queryParams);

-	}

-

-	protected void deleteSubResource(String subResourceName) {

-		try {

-			resource.path(subResourceName).header(HTTP_HEADER_AUTH, authHeader).delete();

-		} catch (UniformInterfaceException e) {

-			throw new GlusterRuntimeException(e.getResponse().getEntity(String.class));

-		}

-	}

-

-	public abstract String getResourcePath();

-

-	/**

-	 * @return the securityToken

-	 */

-	protected String getSecurityToken() {

-		return securityToken;

-	}

-

-	/**

-	 * @param securityToken

-	 *            the securityToken to set

-	 */

-	protected void setSecurityToken(String securityToken) {

-		AbstractClient.securityToken = securityToken;

-		authHeader = "Basic " + securityToken;

-	}

-

-	/**

-	 * @param uri

-	 *            The URI to be fetched using GET API

-	 * @param responseClass

-	 *            Expected type of response object

-	 * @return Object of the given class

-	 */

-	protected <T> T fetchResource(URI uri, Class<T> responseClass) {

-		return fetchResource(client.resource(uri), NO_PARAMS, responseClass);

-	}

-}

+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.client;
+
+import static org.gluster.storage.management.client.constants.ClientConstants.ALGORITHM_SUNX509;
+import static org.gluster.storage.management.client.constants.ClientConstants.KEYSTORE_TYPE_JKS;
+import static org.gluster.storage.management.client.constants.ClientConstants.PROTOCOL_TLS;
+import static org.gluster.storage.management.client.constants.ClientConstants.TRUSTED_KEYSTORE;
+import static org.gluster.storage.management.client.constants.ClientConstants.TRUSTED_KEYSTORE_ACCESS;
+
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.ConnectException;
+import java.net.URI;
+import java.security.KeyStore;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.TrustManagerFactory;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.Response;
+
+import org.gluster.storage.management.client.utils.ClientUtil;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.UniformInterfaceException;
+import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.api.client.WebResource.Builder;
+import com.sun.jersey.api.client.config.DefaultClientConfig;
+import com.sun.jersey.api.representation.Form;
+import com.sun.jersey.client.urlconnection.HTTPSProperties;
+import com.sun.jersey.core.util.MultivaluedMapImpl;
+import com.sun.jersey.multipart.FormDataMultiPart;
+
+public abstract class AbstractClient {
+	private static final String HTTP_HEADER_AUTH = "Authorization";
+	protected static final MultivaluedMap<String, String> NO_PARAMS = new MultivaluedMapImpl();
+	protected static String clusterName;
+	protected static String securityToken;
+	protected WebResource resource;
+	private String authHeader;
+	private Client client;
+
+	/**
+	 * This constructor will work only after the data model manager has been initialized.
+	 */
+	public AbstractClient() {
+		this(securityToken, clusterName);
+	}
+
+	/**
+	 * This constructor will work only after the data model manager has been initialized.
+	 */
+	public AbstractClient(String clusterName) {
+		this(securityToken, clusterName);
+	}
+
+	public AbstractClient(String securityToken, String clusterName) {
+		AbstractClient.clusterName = clusterName;
+		setSecurityToken(securityToken);
+
+		createClient();
+
+		// this must be after setting clusterName as sub-classes may refer to cluster name in the getResourcePath method
+		resource = client.resource(ClientUtil.getServerBaseURI()).path(getResourcePath());
+	}
+
+	private void createClient() {
+		SSLContext context = initializeSSLContext();
+		DefaultClientConfig config = createClientConfig(context);
+		client = Client.create(config);
+	}
+
+	private DefaultClientConfig createClientConfig(SSLContext context) {
+		DefaultClientConfig config = new DefaultClientConfig();
+		config.getProperties().put(HTTPSProperties.PROPERTY_HTTPS_PROPERTIES,
+				new HTTPSProperties(createHostnameVerifier(), context));
+		return config;
+	}
+
+	private HostnameVerifier createHostnameVerifier() {
+		HostnameVerifier hostnameVerifier = new HostnameVerifier() {
+			@Override
+			public boolean verify(String arg0, SSLSession arg1) {
+				return true;
+			}
+		};
+		return hostnameVerifier;
+	}
+
+	private SSLContext initializeSSLContext() {
+		SSLContext context = null;
+		try {
+			context = SSLContext.getInstance(PROTOCOL_TLS);
+
+			KeyStore keyStore = KeyStore.getInstance(KEYSTORE_TYPE_JKS);
+			keyStore.load(loadResource(TRUSTED_KEYSTORE), TRUSTED_KEYSTORE_ACCESS.toCharArray());
+
+			KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance(ALGORITHM_SUNX509);
+			keyManagerFactory.init(keyStore, TRUSTED_KEYSTORE_ACCESS.toCharArray());
+
+			TrustManagerFactory trustManagerFactory = TrustManagerFactory.getInstance(ALGORITHM_SUNX509);
+			trustManagerFactory.init(keyStore);
+
+			context.init(keyManagerFactory.getKeyManagers(), trustManagerFactory.getTrustManagers(), null);
+		} catch (Exception e) {
+			throw new GlusterRuntimeException(
+					"Couldn't initialize SSL Context with Gluster Management Gateway! Error: " + e, e);
+		}
+		return context;
+	}
+
+	private InputStream loadResource(String resourcePath) {
+		return this.getClass().getClassLoader().getResourceAsStream(resourcePath);
+	}
+
+	/**
+	 * Fetches the given resource by dispatching a GET request
+	 * 
+	 * @param res
+	 *            Resource to be fetched
+	 * @param queryParams
+	 *            Query parameters to be sent for the GET request
+	 * @param responseClass
+	 *            Expected class of the response
+	 * @return Object of responseClass received as a result of the GET request
+	 */
+	private <T> T fetchResource(WebResource res, MultivaluedMap<String, String> queryParams, Class<T> responseClass) {
+		try {
+			return res.queryParams(queryParams).header(HTTP_HEADER_AUTH, authHeader).accept(MediaType.APPLICATION_XML)
+					.get(responseClass);
+		} catch (Exception e1) {
+			throw createGlusterException(e1);
+		}
+	}
+
+	private GlusterRuntimeException createGlusterException(Exception e) {
+		if (e instanceof GlusterRuntimeException) {
+			return (GlusterRuntimeException) e;
+		}
+
+		if (e instanceof UniformInterfaceException) {
+			UniformInterfaceException uie = (UniformInterfaceException) e;
+			if ((uie.getResponse().getStatus() == Response.Status.UNAUTHORIZED.getStatusCode())) {
+				// authentication failed. clear security token.
+				setSecurityToken(null);
+				return new GlusterRuntimeException("Invalid credentials!");
+			} else {
+				return new GlusterRuntimeException("[" + uie.getResponse().getStatus() + "]["
+						+ uie.getResponse().getEntity(String.class) + "]");
+			}
+		} else {
+			Throwable cause = e.getCause();
+			if (cause != null && cause instanceof ConnectException) {
+				return new GlusterRuntimeException("Couldn't connect to Gluster Management Gateway!");
+			}
+
+			return new GlusterRuntimeException("Exception in REST communication! [" + e.getMessage() + "]", e);
+		}
+	}
+
+	protected void downloadResource(WebResource res, String filePath) {
+		ClientResponse response = null;
+		try {
+			response = res.header(HTTP_HEADER_AUTH, authHeader).accept(MediaType.APPLICATION_OCTET_STREAM)
+				.get(ClientResponse.class);
+			checkResponseStatus(response);
+		} catch (Exception e1) {
+			throw createGlusterException(e1);
+		}
+		
+		try {
+			if (!response.hasEntity()) {
+				throw new GlusterRuntimeException("No entity in response!");
+			}
+
+			InputStream inputStream = response.getEntityInputStream();
+			FileOutputStream outputStream = new FileOutputStream(filePath);
+
+			int c;
+			while ((c = inputStream.read()) != -1) {
+				outputStream.write(c);
+			}
+			inputStream.close();
+			outputStream.close();
+		} catch (IOException e) {
+			throw new GlusterRuntimeException("Error while downloading resource [" + res.getURI().getPath() + "]", e);
+		}
+	}
+
+	public void uploadResource(WebResource res, FormDataMultiPart form) {
+		try {
+			res.header(HTTP_HEADER_AUTH, authHeader).type(MediaType.MULTIPART_FORM_DATA_TYPE).post(String.class, form);
+		} catch (Exception e) {
+			throw createGlusterException(e);
+		}
+	}
+
+	/**
+	 * Fetches the default resource (the one returned by {@link AbstractClient#getResourcePath()}) by dispatching a GET
+	 * request on the resource
+	 * 
+	 * @param queryParams
+	 *            Query parameters to be sent for the GET request
+	 * @param responseClass
+	 *            Expected class of the response
+	 * @return Object of responseClass received as a result of the GET request
+	 */
+	protected <T> T fetchResource(MultivaluedMap<String, String> queryParams, Class<T> responseClass) {
+		return fetchResource(resource, queryParams, responseClass);
+	}
+
+	/**
+	 * Fetches the default resource (the one returned by {@link AbstractClient#getResourcePath()}) by dispatching a GET
+	 * request on the resource
+	 * 
+	 * @param responseClass
+	 *            Expected class of the response
+	 * @return Object of responseClass received as a result of the GET request
+	 */
+	protected <T> T fetchResource(Class<T> responseClass) {
+		return fetchResource(resource, NO_PARAMS, responseClass);
+	}
+
+	/**
+	 * Fetches the resource whose name is arrived at by appending the "subResourceName" parameter to the default
+	 * resource (the one returned by {@link AbstractClient#getResourcePath()})
+	 * 
+	 * @param subResourceName
+	 *            Name of the sub-resource
+	 * @param responseClass
+	 *            Expected class of the response
+	 * @return Object of responseClass received as a result of the GET request on the sub-resource
+	 */
+	protected <T> T fetchSubResource(String subResourceName, Class<T> responseClass) {
+		return fetchResource(resource.path(subResourceName), NO_PARAMS, responseClass);
+	}
+
+	protected void downloadSubResource(String subResourceName, String filePath) {
+		downloadResource(resource.path(subResourceName), filePath);
+	}
+
+	/**
+	 * Fetches the resource whose name is arrived at by appending the "subResourceName" parameter to the default
+	 * resource (the one returned by {@link AbstractClient#getResourcePath()})
+	 * 
+	 * @param subResourceName
+	 *            Name of the sub-resource
+	 * @param queryParams
+	 *            Query parameters to be sent for the GET request
+	 * @param responseClass
+	 *            Expected class of the response
+	 * @return Object of responseClass received as a result of the GET request on the sub-resource
+	 */
+	protected <T> T fetchSubResource(String subResourceName, MultivaluedMap<String, String> queryParams,
+			Class<T> responseClass) {
+		return fetchResource(resource.path(subResourceName), queryParams, responseClass);
+	}
+
+	private ClientResponse postRequest(WebResource resource, Form form) {
+		try {
+			ClientResponse response = prepareFormRequestBuilder(resource).post(ClientResponse.class, form);
+			checkResponseStatus(response);
+			return response;
+		} catch (UniformInterfaceException e) {
+			throw new GlusterRuntimeException(e.getResponse().getEntity(String.class));
+		}
+	}
+
+	/**
+	 * Submits given object to the resource and returns the object received as response
+	 * 
+	 * @param responseClass
+	 *            Class of the object expected as response
+	 * @param requestObject
+	 *            the Object to be submitted
+	 * @return Object of given class received as response
+	 */
+	protected <T> T postObject(Class<T> responseClass, Object requestObject) {
+		return resource.type(MediaType.APPLICATION_XML).header(HTTP_HEADER_AUTH, authHeader)
+				.accept(MediaType.APPLICATION_XML).post(responseClass, requestObject);
+	}
+
+	/**
+	 * Submits given Form using POST method to the resource and returns the object received as response
+	 * 
+	 * @param form
+	 *            Form to be submitted
+	 */
+	protected URI postRequest(Form form) {
+		return postRequest(resource, form).getLocation();
+	}
+
+	/**
+	 * Submits given Form using POST method to the given sub-resource and returns the object received as response
+	 * 
+	 * @param subResourceName
+	 *            Name of the sub-resource to which the request is to be posted
+	 * @param form
+	 *            Form to be submitted
+	 */
+	protected void postRequest(String subResourceName, Form form) {
+		postRequest(resource.path(subResourceName), form);
+	}
+
+	private ClientResponse putRequest(WebResource resource, Form form) {
+		try {
+			ClientResponse response = prepareFormRequestBuilder(resource).put(ClientResponse.class, form);
+			checkResponseStatus(response);
+			return response;
+		} catch (Exception e) {
+			throw createGlusterException(e);
+		}
+	}
+
+	private void checkResponseStatus(ClientResponse response) {
+		if ((response.getStatus() == Response.Status.UNAUTHORIZED.getStatusCode())) {
+			// authentication failed. clear security token.
+			setSecurityToken(null);
+			throw new GlusterRuntimeException("Invalid credentials!");
+		}
+		if (response.getStatus() >= 300) {
+			throw new GlusterRuntimeException(response.getEntity(String.class));
+		}
+	}
+
+	public Builder prepareFormRequestBuilder(WebResource resource) {
+		return resource.type(MediaType.APPLICATION_FORM_URLENCODED_TYPE).header(HTTP_HEADER_AUTH, authHeader)
+				.accept(MediaType.APPLICATION_XML);
+	}
+
+	/**
+	 * Submits given Form using PUT method to the given sub-resource and returns the object received as response
+	 * 
+	 * @param subResourceName
+	 *            Name of the sub-resource to which the request is to be posted
+	 * @param form
+	 *            Form to be submitted
+	 */
+	protected void putRequest(String subResourceName, Form form) {
+		putRequest(resource.path(subResourceName), form);
+	}
+
+	protected URI putRequestURI(String subResourceName, Form form) {
+		ClientResponse response = putRequest(resource.path(subResourceName), form);
+		return response.getLocation();
+	}
+
+	/**
+	 * Submits given Form using PUT method to the given sub-resource and returns the object received as response
+	 * 
+	 * @param form
+	 *            Form to be submitted
+	 */
+	protected void putRequest(Form form) {
+		putRequest(resource, form);
+	}
+
+	/**
+	 * Submits given Form using PUT method to the given sub-resource and returns the object received as response
+	 * 
+	 * @param subResourceName
+	 *            Name of the sub-resource to which the request is to be posted
+	 */
+	protected void putRequest(String subResourceName) {
+		try {
+			prepareFormRequestBuilder(resource.path(subResourceName)).put();
+		} catch (UniformInterfaceException e) {
+			throw new GlusterRuntimeException(e.getResponse().getEntity(String.class));
+		}
+	}
+
+	private void deleteResource(WebResource resource, MultivaluedMap<String, String> queryParams) {
+		try {
+			resource.queryParams(queryParams).header(HTTP_HEADER_AUTH, authHeader).delete();
+		} catch (UniformInterfaceException e) {
+			throw new GlusterRuntimeException(e.getResponse().getEntity(String.class));
+		}
+	}
+
+	protected void deleteResource(MultivaluedMap<String, String> queryParams) {
+		deleteResource(resource, queryParams);
+	}
+
+	protected void deleteSubResource(String subResourceName, MultivaluedMap<String, String> queryParams) {
+		deleteResource(resource.path(subResourceName), queryParams);
+	}
+
+	protected void deleteSubResource(String subResourceName) {
+		try {
+			resource.path(subResourceName).header(HTTP_HEADER_AUTH, authHeader).delete();
+		} catch (UniformInterfaceException e) {
+			throw new GlusterRuntimeException(e.getResponse().getEntity(String.class));
+		}
+	}
+
+	public abstract String getResourcePath();
+
+	/**
+	 * @return the securityToken
+	 */
+	protected String getSecurityToken() {
+		return securityToken;
+	}
+
+	/**
+	 * @param securityToken
+	 *            the securityToken to set
+	 */
+	protected void setSecurityToken(String securityToken) {
+		AbstractClient.securityToken = securityToken;
+		authHeader = "Basic " + securityToken;
+	}
+
+	/**
+	 * @param uri
+	 *            The URI to be fetched using GET API
+	 * @param responseClass
+	 *            Expected type of response object
+	 * @return Object of the given class
+	 */
+	protected <T> T fetchResource(URI uri, Class<T> responseClass) {
+		return fetchResource(client.resource(uri), NO_PARAMS, responseClass);
+	}
+}
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/ClustersClient.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/ClustersClient.java
index d6bf962a..fc012dc3 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/ClustersClient.java
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/ClustersClient.java
@@ -1,30 +1,31 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.client;
+package org.gluster.storage.management.client;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CLUSTER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CLUSTER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
 
 import java.util.List;
 
-import com.gluster.storage.management.core.response.ClusterNameListResponse;
+import org.gluster.storage.management.core.response.ClusterNameListResponse;
+
 import com.sun.jersey.api.representation.Form;
 
 /**
@@ -41,7 +42,7 @@ public class ClustersClient extends AbstractClient {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.client.AbstractClient#getResourcePath()
+	 * @see org.gluster.storage.management.client.AbstractClient#getResourcePath()
 	 */
 	@Override
 	public String getResourcePath() {
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/DiscoveredServersClient.java
index 6b7af5b0..44c93b72 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/DiscoveredServersClient.java
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/DiscoveredServersClient.java
@@ -1,34 +1,35 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.client;
+package org.gluster.storage.management.client;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DETAILS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_DISCOVERED_SERVERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DETAILS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_DISCOVERED_SERVERS;
 
 import java.util.List;
 
 import javax.ws.rs.core.MultivaluedMap;
 
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.response.ServerListResponse;
-import com.gluster.storage.management.core.response.ServerNameListResponse;
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.response.ServerListResponse;
+import org.gluster.storage.management.core.response.ServerNameListResponse;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
+
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 
 public class DiscoveredServersClient extends AbstractClient {
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterServersClient.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/GlusterServersClient.java
index 3d27afb2..4827c1d5 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/GlusterServersClient.java
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/GlusterServersClient.java
@@ -1,37 +1,39 @@
 /*******************************************************************************
-* Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.client;
+package org.gluster.storage.management.client;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DETAILS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_SERVERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DETAILS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_SERVERS;
 
 import java.net.URI;
 import java.util.List;
 
 import javax.ws.rs.core.MultivaluedMap;
 
-import com.gluster.storage.management.core.constants.RESTConstants;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.ServerStats;
-import com.gluster.storage.management.core.response.GlusterServerListResponse;
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
+import org.gluster.storage.management.core.constants.RESTConstants;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.ServerStats;
+import org.gluster.storage.management.core.response.FsTypeListResponse;
+import org.gluster.storage.management.core.response.GlusterServerListResponse;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
+
 import com.sun.jersey.api.representation.Form;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 
@@ -76,9 +78,16 @@ public class GlusterServersClient extends AbstractClient {
 		return postRequest(form);
 	}
 	
-	public URI initializeDisk(String serverName, String diskName, String fsType) {
+	public List<String> getFSTypes(String serverName) {
+		FsTypeListResponse fsTypeListResponse = ((FsTypeListResponse) fetchSubResource(serverName + "/" + RESTConstants.RESOURCE_FSTYPES,
+				FsTypeListResponse.class));
+		return fsTypeListResponse.getFsTypes();
+	}
+
+	public URI initializeDisk(String serverName, String diskName, String fsType, String mountPoint) {
 		Form form = new Form();
 		form.add(RESTConstants.FORM_PARAM_FSTYPE, fsType);
+		form.add(RESTConstants.FORM_PARAM_MOUNTPOINT, mountPoint);
 		return putRequestURI(serverName + "/" + RESTConstants.RESOURCE_DISKS + "/" + diskName, form);
 	}
 	
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/KeysClient.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/KeysClient.java
index 51fda466..feb24241 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/KeysClient.java
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/KeysClient.java
@@ -1,31 +1,30 @@
-/**
- * KeysClient.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.client;
+ *******************************************************************************/
+package org.gluster.storage.management.client;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 
 import javax.ws.rs.core.MediaType;
 
-import com.gluster.storage.management.core.constants.RESTConstants;
+import org.gluster.storage.management.core.constants.RESTConstants;
+
 import com.sun.jersey.multipart.FormDataMultiPart;
 
 public class KeysClient extends AbstractClient {
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/TasksClient.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/TasksClient.java
index 46077371..d8005cfc 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/TasksClient.java
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/TasksClient.java
@@ -1,33 +1,32 @@
-/**
- * tasksClient.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.client;
+ *******************************************************************************/
+package org.gluster.storage.management.client;
 
 import java.net.URI;
 import java.util.List;
 
 import javax.ws.rs.core.MultivaluedMap;
 
-import com.gluster.storage.management.core.constants.RESTConstants;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.response.TaskInfoListResponse;
+import org.gluster.storage.management.core.constants.RESTConstants;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.response.TaskInfoListResponse;
+
 import com.sun.jersey.api.representation.Form;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/UsersClient.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/UsersClient.java
index 4e89e994..cc82a5e8 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/UsersClient.java
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/UsersClient.java
@@ -1,29 +1,30 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.client;
+package org.gluster.storage.management.client;
+
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_NEW_PASSWORD;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_OLD_PASSWORD;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_NEW_PASSWORD;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_OLD_PASSWORD;
+import org.gluster.storage.management.core.constants.RESTConstants;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Status;
 
-import com.gluster.storage.management.core.constants.RESTConstants;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Status;
 import com.sun.jersey.api.representation.Form;
 import com.sun.jersey.core.util.Base64;
 
@@ -77,7 +78,7 @@ public class UsersClient extends AbstractClient {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see com.gluster.storage.management.client.AbstractClient#getResourceName()
+	 * @see org.gluster.storage.management.client.AbstractClient#getResourceName()
 	 */
 	@Override
 	public String getResourcePath() {
@@ -87,7 +88,7 @@ public class UsersClient extends AbstractClient {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see com.gluster.storage.management.client.AbstractClient#getSecurityToken()
+	 * @see org.gluster.storage.management.client.AbstractClient#getSecurityToken()
 	 */
 	@Override
 	public String getSecurityToken() {
diff --git a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/VolumesClient.java
index ec8d0212..442f61f6 100644
--- a/src/com.gluster.storage.management.client/src/com/gluster/storage/management/client/VolumesClient.java
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/VolumesClient.java
@@ -1,34 +1,32 @@
-/**
- * VolumesClient.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.client;
+ *******************************************************************************/
+package org.gluster.storage.management.client;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_ACCESS_PROTOCOLS;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_BRICKS;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CIFS_USERS;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_REPLICA_COUNT;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_STRIPE_COUNT;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_TRANSPORT_TYPE;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_OPTIONS;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_TYPE;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_ACCESS_PROTOCOLS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_BRICKS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CIFS_USERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_REPLICA_COUNT;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_STRIPE_COUNT;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_TRANSPORT_TYPE;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_OPTIONS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_TYPE;
 
 import java.net.URI;
 import java.util.Date;
@@ -37,19 +35,20 @@ import java.util.Set;
 
 import javax.ws.rs.core.MultivaluedMap;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.constants.RESTConstants;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.VolumeLogMessage;
-import com.gluster.storage.management.core.model.VolumeOptionInfo;
-import com.gluster.storage.management.core.response.LogMessageListResponse;
-import com.gluster.storage.management.core.response.VolumeListResponse;
-import com.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
-import com.gluster.storage.management.core.utils.DateUtil;
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.constants.RESTConstants;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.VolumeLogMessage;
+import org.gluster.storage.management.core.model.VolumeOptionInfo;
+import org.gluster.storage.management.core.response.LogMessageListResponse;
+import org.gluster.storage.management.core.response.VolumeListResponse;
+import org.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
+import org.gluster.storage.management.core.utils.DateUtil;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 import com.sun.jersey.api.representation.Form;
 import com.sun.jersey.core.util.MultivaluedMapImpl;
 
diff --git a/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/constants/ClientConstants.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/constants/ClientConstants.java
new file mode 100644
index 00000000..c2dd1890
--- /dev/null
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/constants/ClientConstants.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.client.constants;
+
+/**
+ *
+ */
+public class ClientConstants {
+	public static final String SYS_PROP_SERVER_URL = "gluster.server.url";
+	public static final String DEFAULT_SERVER_URL = "https://localhost:8443/glustermg/linux.gtk.x86_64";
+	public static final String CONTEXT_ROOT = "glustermg";
+	public static final String SYS_PROP_API_VERSION = "gluster.api.version";
+	public static final String DEFAULT_API_VERSION = "@VERSION@";
+	
+	// SSL related
+	public static final String TRUSTED_KEYSTORE = "gmc-trusted.keystore"; 
+	public static final String TRUSTED_KEYSTORE_ACCESS = "gluster";
+	public static final String PROTOCOL_TLS = "TLS";
+	public static final String ALGORITHM_SUNX509 = "SunX509";
+	public static final String KEYSTORE_TYPE_JKS = "JKS";
+}
+
diff --git a/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/utils/ClientUtil.java b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/utils/ClientUtil.java
new file mode 100644
index 00000000..a4d665f9
--- /dev/null
+++ b/src/org.gluster.storage.management.client/src/org/gluster/storage/management/client/utils/ClientUtil.java
@@ -0,0 +1,43 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.client.utils;
+
+import java.net.URI;
+
+import javax.ws.rs.core.UriBuilder;
+
+import org.gluster.storage.management.client.constants.ClientConstants;
+
+
+public class ClientUtil {
+
+	public static URI getServerBaseURI() {
+		return UriBuilder.fromUri(getBaseURL()).path(getAPIVersion()).build();
+	}
+	
+	private static String getAPIVersion() {
+		return System.getProperty(ClientConstants.SYS_PROP_API_VERSION, ClientConstants.DEFAULT_API_VERSION);
+	}
+	
+	private static String getBaseURL() {
+		// remove the platform path (e.g. /linux.gtk.x86_64) from the URL
+		return System.getProperty(ClientConstants.SYS_PROP_SERVER_URL, ClientConstants.DEFAULT_SERVER_URL)
+				.replaceAll(ClientConstants.CONTEXT_ROOT + "\\/.*", ClientConstants.CONTEXT_ROOT + "\\/");
+	}
+}
diff --git a/src/com.gluster.storage.management.console.feature.webstart/.project b/src/org.gluster.storage.management.console.feature.webstart/.project
index ebf9c846..f306a1c9 100644
--- a/src/com.gluster.storage.management.console.feature.webstart/.project
+++ b/src/org.gluster.storage.management.console.feature.webstart/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.console.feature.webstart</name>
+	<name>org.gluster.storage.management.console.feature.webstart</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.console.feature.webstart/buckminster.cspex b/src/org.gluster.storage.management.console.feature.webstart/buckminster.cspex
index 252a5e15..7a7a9b95 100644
--- a/src/com.gluster.storage.management.console.feature.webstart/buckminster.cspex
+++ b/src/org.gluster.storage.management.console.feature.webstart/buckminster.cspex
@@ -37,5 +37,11 @@
 				<property key="targets" value="copy.root.files" />
 			</actorProperties>
 		</public>
+		<public name="update.version" actor="ant">
+			<actorProperties>
+				<property key="buildFile" value="build/glustermc.ant" />
+				<property key="targets" value="update.version" />
+			</actorProperties>
+		</public>
 	</actions>
 </cspecExtension>
diff --git a/src/org.gluster.storage.management.console.feature.webstart/build.properties b/src/org.gluster.storage.management.console.feature.webstart/build.properties
new file mode 100644
index 00000000..44f026e3
--- /dev/null
+++ b/src/org.gluster.storage.management.console.feature.webstart/build.properties
@@ -0,0 +1,20 @@
+###############################################################################
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Console.
+#
+# Gluster Management Console 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.
+#
+# Gluster Management Console 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/>.
+###############################################################################
+#bin.includes = feature.xml
+root=rootfiles
diff --git a/src/com.gluster.storage.management.console.feature.webstart/build/glustermc.ant b/src/org.gluster.storage.management.console.feature.webstart/build/glustermc.ant
index 6b0152f6..a1dc0c66 100644
--- a/src/com.gluster.storage.management.console.feature.webstart/build/glustermc.ant
+++ b/src/org.gluster.storage.management.console.feature.webstart/build/glustermc.ant
@@ -1,5 +1,7 @@
 <project>
 	<property name="export.dir" value="${buckminster.output}/glustermc/" />
+	<property name="jnlp.file" value="${export.dir}/gluster-management-console.jnlp" />
+
 	<target name='unsign'>
 		<buckminster.signatureCleaner>
 			<fileset dir='${export.dir}/plugins'>
@@ -12,7 +14,7 @@
 	</target>
 
 	<target name="sign">
-		<signjar alias="gluster" storepass="gluster" keypass="gluster" keystore="/var/lib/jenkins/gmc/gluster.keystore">
+		<signjar alias="gluster" storepass="gluster" keypass="gluster" keystore="${jar.signing.keystore}">
 			<fileset dir="${export.dir}/plugins">
 				<include name="*.jar" />
 			</fileset>
@@ -27,4 +29,17 @@
 			<fileset dir="${basedir}/rootfiles" />
 		</copy>
 	</target>
+
+	<target name='update.version'>
+		<replace file="${jnlp.file}" token="@VERSION@" value="${product.version}" />
+		<move todir="${export.dir}">
+			<fileset dir="${export.dir}" />
+			<mapper>
+				<mapper type="regexp"
+		                from="org.gluster.storage.management.console.feature_.*.jnlp" 
+		        		to="org.gluster.storage.management.console.feature_${product.version}.jnlp" />
+			</mapper>
+		</move>
+	</target>
+
 </project>
diff --git a/src/com.gluster.storage.management.console.feature.webstart/feature.xml b/src/org.gluster.storage.management.console.feature.webstart/feature.xml
index 24a76dc9..beab8637 100644
--- a/src/com.gluster.storage.management.console.feature.webstart/feature.xml
+++ b/src/org.gluster.storage.management.console.feature.webstart/feature.xml
@@ -1,9 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+    This file is part of Gluster Management Console.
+   
+    Gluster Management Console 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.
+   
+    Gluster Management Console 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/>.
+ -->
 <feature
-      id="com.gluster.storage.management.console.feature.webstart"
+      id="org.gluster.storage.management.console.feature.webstart"
       label="Gluster Management Console - Webstart"
-      version="1.0.0"
-      provider-name="Gluster Inc."
+      version="1.0.0.qualifier"
+      provider-name="Gluster"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64,amd64">
@@ -21,7 +39,7 @@
    </license>
 
    <includes
-         id="com.gluster.storage.management.console.feature"
+         id="org.gluster.storage.management.console.feature"
          version="0.0.0"/>
 
    <requires>
diff --git a/src/com.gluster.storage.management.console.feature.webstart/rootfiles/gluster-management-console.jnlp b/src/org.gluster.storage.management.console.feature.webstart/rootfiles/gluster-management-console.jnlp
index 3ac01605..b5417bb8 100644
--- a/src/com.gluster.storage.management.console.feature.webstart/rootfiles/gluster-management-console.jnlp
+++ b/src/org.gluster.storage.management.console.feature.webstart/rootfiles/gluster-management-console.jnlp
@@ -20,7 +20,7 @@
 		<jar href="plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar" main="true"/>
 		<extension
 			name="Gluster Management Console"
-			href="com.gluster.storage.management.console.feature_1.0.0.jnlp"/>
+			href="org.gluster.storage.management.console.feature_@VERSION@.jnlp"/>
 		<property
 			name="osgi.instance.area"
 			value="@user.home/Application Data/glustermc"/>
@@ -29,10 +29,13 @@
 			value="@user.home/Application Data/glustermc"/>
 		<property
 			name="eclipse.product"
-			value="com.gluster.storage.management.console.product"/>
+			value="org.gluster.storage.management.console.product"/>
 		<property
 			name="gluster.server.url"
 			value="$$codebase"/>
+		<property
+			name="gluster.api.version"
+			value="@VERSION@"/>
 		<property 
 			name="javaws.cfg.jauthenticator" 
 			value="true"/>
diff --git a/src/com.gluster.storage.management.console.feature.webstart/rootfiles/splash.png b/src/org.gluster.storage.management.console.feature.webstart/rootfiles/splash.png
index 74983f8a..74983f8a 100644
--- a/src/com.gluster.storage.management.console.feature.webstart/rootfiles/splash.png
+++ b/src/org.gluster.storage.management.console.feature.webstart/rootfiles/splash.png
diff --git a/src/com.gluster.storage.management.releng/.project b/src/org.gluster.storage.management.console.feature/.project
index f4723731..a4a4a321 100644
--- a/src/com.gluster.storage.management.releng/.project
+++ b/src/org.gluster.storage.management.console.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.releng</name>
+	<name>org.gluster.storage.management.console.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/org.gluster.storage.management.console.feature/build.properties b/src/org.gluster.storage.management.console.feature/build.properties
new file mode 100644
index 00000000..66f4d625
--- /dev/null
+++ b/src/org.gluster.storage.management.console.feature/build.properties
@@ -0,0 +1,19 @@
+###############################################################################
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Console.
+#
+# Gluster Management Console 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.
+#
+# Gluster Management Console 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/>.
+###############################################################################
+bin.includes = feature.xml
diff --git a/src/com.gluster.storage.management.console.feature/feature.xml b/src/org.gluster.storage.management.console.feature/feature.xml
index aaf4a08c..473b1947 100644
--- a/src/com.gluster.storage.management.console.feature/feature.xml
+++ b/src/org.gluster.storage.management.console.feature/feature.xml
@@ -1,9 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+    This file is part of Gluster Management Console.
+   
+    Gluster Management Console 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.
+   
+    Gluster Management Console 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/>.
+ -->
 <feature
-      id="com.gluster.storage.management.console.feature"
+      id="org.gluster.storage.management.console.feature"
       label="Gluster Management Console"
-      version="1.0.0"
-      provider-name="Gluster, Inc."
+      version="1.0.0.qualifier"
+      provider-name="Gluster"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64,amd64">
@@ -218,7 +236,7 @@
          unpack="false"/>
 
    <plugin
-         id="com.gluster.storage.management.console"
+         id="org.gluster.storage.management.console"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -621,7 +639,7 @@
          fragment="true"/>
 
    <plugin
-         id="com.gluster.storage.management.core"
+         id="org.gluster.storage.management.core"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -691,7 +709,7 @@
          unpack="false"/>
 
    <plugin
-         id="com.gluster.storage.management.client"
+         id="org.gluster.storage.management.client"
          download-size="0"
          install-size="0"
          version="0.0.0"
@@ -773,7 +791,7 @@
          unpack="false"/>
 
    <plugin
-         id="com.gluster.storage.management.console.help"
+         id="org.gluster.storage.management.console.help"
          download-size="0"
          install-size="0"
          version="0.0.0"/>
diff --git a/src/com.gluster.storage.management.console.help/.project b/src/org.gluster.storage.management.console.help/.project
index ba39c551..51640e5e 100644
--- a/src/com.gluster.storage.management.console.help/.project
+++ b/src/org.gluster.storage.management.console.help/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.console.help</name>
+	<name>org.gluster.storage.management.console.help</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.console.help/.settings/org.eclipse.core.resources.prefs b/src/org.gluster.storage.management.console.help/.settings/org.eclipse.core.resources.prefs
index 970d49e2..970d49e2 100644
--- a/src/com.gluster.storage.management.console.help/.settings/org.eclipse.core.resources.prefs
+++ b/src/org.gluster.storage.management.console.help/.settings/org.eclipse.core.resources.prefs
diff --git a/src/com.gluster.storage.management.console.help/.settings/org.eclipse.wst.css.core.prefs b/src/org.gluster.storage.management.console.help/.settings/org.eclipse.wst.css.core.prefs
index d7503970..d7503970 100644
--- a/src/com.gluster.storage.management.console.help/.settings/org.eclipse.wst.css.core.prefs
+++ b/src/org.gluster.storage.management.console.help/.settings/org.eclipse.wst.css.core.prefs
diff --git a/src/com.gluster.storage.management.console.help/META-INF/MANIFEST.MF b/src/org.gluster.storage.management.console.help/META-INF/MANIFEST.MF
index 7795e50d..c86045d4 100644
--- a/src/com.gluster.storage.management.console.help/META-INF/MANIFEST.MF
+++ b/src/org.gluster.storage.management.console.help/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Gluster Management Console - Help
-Bundle-SymbolicName: com.gluster.storage.management.console.help; singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Vendor: GLUSTER
+Bundle-SymbolicName: org.gluster.storage.management.console.help;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: Gluster
 Require-Bundle: org.eclipse.help.ui;bundle-version="3.5.2",
  org.eclipse.help.webapp;bundle-version="3.5.2",
  org.eclipse.help
diff --git a/src/org.gluster.storage.management.console.help/build.properties b/src/org.gluster.storage.management.console.help/build.properties
new file mode 100644
index 00000000..f4ce4012
--- /dev/null
+++ b/src/org.gluster.storage.management.console.help/build.properties
@@ -0,0 +1,26 @@
+###############################################################################
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Console.
+#
+# Gluster Management Console 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.
+#
+# Gluster Management Console 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/>.
+###############################################################################
+bin.includes = plugin.xml,\
+               META-INF/,\
+               html/,\
+               toc.xml,\
+               tocconcepts.xml,\
+               tocgettingstarted.xml,\
+               toctasks.xml,\
+               tocreference.xml
diff --git a/src/com.gluster.storage.management.console.help/html/concepts/about_gmc.html b/src/org.gluster.storage.management.console.help/html/concepts/about_gmc.html
index ef79927b..ef79927b 100644
--- a/src/com.gluster.storage.management.console.help/html/concepts/about_gmc.html
+++ b/src/org.gluster.storage.management.console.help/html/concepts/about_gmc.html
diff --git a/src/com.gluster.storage.management.console.help/html/concepts/about_gmg.html b/src/org.gluster.storage.management.console.help/html/concepts/about_gmg.html
index 34f9c860..34f9c860 100644
--- a/src/com.gluster.storage.management.console.help/html/concepts/about_gmg.html
+++ b/src/org.gluster.storage.management.console.help/html/concepts/about_gmg.html
diff --git a/src/com.gluster.storage.management.console.help/html/concepts/common_terms.html b/src/org.gluster.storage.management.console.help/html/concepts/common_terms.html
index ccf6d218..ccf6d218 100644
--- a/src/com.gluster.storage.management.console.help/html/concepts/common_terms.html
+++ b/src/org.gluster.storage.management.console.help/html/concepts/common_terms.html
diff --git a/src/com.gluster.storage.management.console.help/html/concepts/gluster_fs.html b/src/org.gluster.storage.management.console.help/html/concepts/gluster_fs.html
index 4efe5f36..4efe5f36 100644
--- a/src/com.gluster.storage.management.console.help/html/concepts/gluster_fs.html
+++ b/src/org.gluster.storage.management.console.help/html/concepts/gluster_fs.html
diff --git a/src/com.gluster.storage.management.console.help/html/concepts/maintopic.html b/src/org.gluster.storage.management.console.help/html/concepts/maintopic.html
index a476078a..a476078a 100644
--- a/src/com.gluster.storage.management.console.help/html/concepts/maintopic.html
+++ b/src/org.gluster.storage.management.console.help/html/concepts/maintopic.html
diff --git a/src/com.gluster.storage.management.console.help/html/concepts/subtopic.html b/src/org.gluster.storage.management.console.help/html/concepts/subtopic.html
index 8a61c501..8a61c501 100644
--- a/src/com.gluster.storage.management.console.help/html/concepts/subtopic.html
+++ b/src/org.gluster.storage.management.console.help/html/concepts/subtopic.html
diff --git a/src/com.gluster.storage.management.console.help/html/concepts/subtopic2.html b/src/org.gluster.storage.management.console.help/html/concepts/subtopic2.html
index 86bcbf9c..86bcbf9c 100644
--- a/src/com.gluster.storage.management.console.help/html/concepts/subtopic2.html
+++ b/src/org.gluster.storage.management.console.help/html/concepts/subtopic2.html
diff --git a/src/com.gluster.storage.management.console.help/html/css/Builder/style.css b/src/org.gluster.storage.management.console.help/html/css/Builder/style.css
index 39efe946..39efe946 100644
--- a/src/com.gluster.storage.management.console.help/html/css/Builder/style.css
+++ b/src/org.gluster.storage.management.console.help/html/css/Builder/style.css
diff --git a/src/com.gluster.storage.management.console.help/html/css/builder-gluster/style.css b/src/org.gluster.storage.management.console.help/html/css/builder-gluster/style.css
index 80daf9fb..80daf9fb 100644
--- a/src/com.gluster.storage.management.console.help/html/css/builder-gluster/style.css
+++ b/src/org.gluster.storage.management.console.help/html/css/builder-gluster/style.css
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/ subtopic3.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/ subtopic3.html
index 86bcbf9c..86bcbf9c 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/ subtopic3.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/ subtopic3.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/access_gmc_jws.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/access_gmc_jws.html
index ff18004a..ff18004a 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/access_gmc_jws.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/access_gmc_jws.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/alerts.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/alerts.html
index 69033fff..69033fff 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/alerts.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/alerts.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/change_password.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/change_password.html
index d5189d98..d5189d98 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/change_password.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/change_password.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_client.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/check_req_client.html
index 76a44038..76a44038 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_client.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/check_req_client.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_gmg.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/check_req_gmg.html
index fa106b64..fa106b64 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/check_req_gmg.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/check_req_gmg.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/cifs_service.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/cifs_service.html
index 21ba31ec..21ba31ec 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/cifs_service.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/cifs_service.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/configure_cifs.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/configure_cifs.html
index 1b39f66a..1b39f66a 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/configure_cifs.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/configure_cifs.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/explore_gmc.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/explore_gmc.html
index 8aee7171..8aee7171 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/explore_gmc.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/explore_gmc.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/gmc_install_overview.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/gmc_install_overview.html
index f8e5e954..f8e5e954 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/gmc_install_overview.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/gmc_install_overview.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/gmc_terminal_window.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/gmc_terminal_window.html
index ee78defe..ee78defe 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/gmc_terminal_window.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/gmc_terminal_window.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/gmc_toolbar.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/gmc_toolbar.html
index 77681663..77681663 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/gmc_toolbar.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/gmc_toolbar.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/gmg_install_overview.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/gmg_install_overview.html
index e6b44580..e6b44580 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/gmg_install_overview.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/gmg_install_overview.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/install_gmg.html
index 94d26c03..94d26c03 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/install_gmg.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg_backend.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/install_gmg_backend.html
index fad76f27..fad76f27 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/install_gmg_backend.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/install_gmg_backend.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic (4).html b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic (4).html
index dccb80ab..dccb80ab 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic (4).html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic (4).html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (3).html b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (3).html
index dccb80ab..dccb80ab 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (3).html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (3).html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (4).html b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (4).html
index dccb80ab..dccb80ab 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (4).html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy (4).html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy.html
index dccb80ab..dccb80ab 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic - Copy.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic.html
index dccb80ab..dccb80ab 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/maintopic.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/maintopic.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_bricks.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_bricks.html
index 96233f0e..96233f0e 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_bricks.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_bricks.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_cluster.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_cluster.html
index 17b7f0a8..17b7f0a8 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_cluster.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_cluster.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_logs.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_logs.html
index 790fc206..790fc206 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_logs.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_logs.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_servers.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_servers.html
index 1326eb34..1326eb34 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_servers.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_servers.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_volumes.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_volumes.html
index a37ed7b4..a37ed7b4 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/manage_volumes.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/manage_volumes.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/monitor_resources.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/monitor_resources.html
index 907f2d73..907f2d73 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/monitor_resources.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/monitor_resources.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/resetting_pwd.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/resetting_pwd.html
index 723a6776..723a6776 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/resetting_pwd.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/resetting_pwd.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/security_keys.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/security_keys.html
index 5b723899..5b723899 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/security_keys.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/security_keys.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_alerts_prefs.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_alerts_prefs.html
index 5673586e..5673586e 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_alerts_prefs.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_alerts_prefs.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_charts_prefs.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_charts_prefs.html
index e85d9324..e85d9324 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_charts_prefs.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_charts_prefs.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_gluster_prefs.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_gluster_prefs.html
index 16db7708..16db7708 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_gluster_prefs.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_gluster_prefs.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_preferences.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_preferences.html
index 13f9f54c..13f9f54c 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_preferences.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_preferences.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_terminal_prefs.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_terminal_prefs.html
index 8f381665..8f381665 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_terminal_prefs.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_terminal_prefs.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_the_gmc.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_the_gmc.html
index 92641ccb..92641ccb 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/setting_the_gmc.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/setting_the_gmc.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic (3) - Copy.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic (3) - Copy.html
index 6dccc35e..6dccc35e 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic (3) - Copy.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic (3) - Copy.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic (3).html b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic (3).html
index 6dccc35e..6dccc35e 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic (3).html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic (3).html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic.html
index 6dccc35e..6dccc35e 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (2).html b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (2).html
index 5ece5749..5ece5749 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (2).html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (2).html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (3).html b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (3).html
index d443ce80..d443ce80 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (3).html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic2 (3).html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic2.html
index 86bcbf9c..86bcbf9c 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/subtopic2.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/subtopic2.html
diff --git a/src/com.gluster.storage.management.console.help/html/gettingstarted/tasks.html b/src/org.gluster.storage.management.console.help/html/gettingstarted/tasks.html
index c5647b9a..c5647b9a 100644
--- a/src/com.gluster.storage.management.console.help/html/gettingstarted/tasks.html
+++ b/src/org.gluster.storage.management.console.help/html/gettingstarted/tasks.html
diff --git a/src/com.gluster.storage.management.console.help/html/help_home.html b/src/org.gluster.storage.management.console.help/html/help_home.html
index b9c17b9e..b9c17b9e 100644
--- a/src/com.gluster.storage.management.console.help/html/help_home.html
+++ b/src/org.gluster.storage.management.console.help/html/help_home.html
diff --git a/src/com.gluster.storage.management.console.help/html/images/Delete-brick.png b/src/org.gluster.storage.management.console.help/html/images/Delete-brick.png
index d93aa173..d93aa173 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Delete-brick.png
+++ b/src/org.gluster.storage.management.console.help/html/images/Delete-brick.png
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC-Preferences-alerts .jpg b/src/org.gluster.storage.management.console.help/html/images/GMC-Preferences-alerts .jpg
index d57c6adc..d57c6adc 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC-Preferences-alerts .jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC-Preferences-alerts .jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC-Preferences-charts.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC-Preferences-charts.jpg
index 7ae6ca8c..7ae6ca8c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC-Preferences-charts.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC-Preferences-charts.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC-Preferences-gluster .jpg b/src/org.gluster.storage.management.console.help/html/images/GMC-Preferences-gluster .jpg
index 06702e7b..06702e7b 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC-Preferences-gluster .jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC-Preferences-gluster .jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_02.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_02.jpg
index 2aac60ff..2aac60ff 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_02.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_02.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_03.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_03.jpg
index 282c1407..282c1407 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_03.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_03.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_04.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_04.jpg
index 383aa719..383aa719 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_04.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_04.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_05.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_05.jpg
index 11f3096d..11f3096d 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_05.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_05.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_06.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_06.jpg
index 97323bd2..97323bd2 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_06.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_06.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_07.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_07.jpg
index fd7e4dd6..fd7e4dd6 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_07.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_07.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_09.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_09.jpg
index 54a10c8c..54a10c8c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_09.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_09.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Brick.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Brick.jpg
index 4480fd27..4480fd27 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Brick.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Brick.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Brick_confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Brick_confirm.jpg
index d609a373..d609a373 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Brick_confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Brick_confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Server_Confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Server_Confirm.jpg
index 4e39d5f4..4e39d5f4 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Server_Confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Add_Server_Confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Create_Vol.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Create_Vol.jpg
index e6b16ddb..e6b16ddb 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Create_Vol.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Create_Vol.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Discovered_Server_Add.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Discovered_Server_Add.jpg
index 7b273913..7b273913 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Discovered_Server_Add.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Discovered_Server_Add.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Display_log_criteria.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Display_log_criteria.jpg
index 9284e314..9284e314 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Display_log_criteria.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Display_log_criteria.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Brick_confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Brick_confirm.jpg
index 891ab993..891ab993 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Brick_confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Brick_confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Bricks.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Bricks.jpg
index d3911aad..d3911aad 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Bricks.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Bricks.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Bricks_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Bricks_success.jpg
index 452e8f20..452e8f20 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Bricks_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Bricks_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Server.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Server.jpg
index c9674b51..c9674b51 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Server.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Server.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Server_1.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Server_1.jpg
index 3c3d7d18..3c3d7d18 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Server_1.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Remove_Server_1.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Select_FS_Type.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Select_FS_Type.jpg
index 08d26e41..08d26e41 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_Select_FS_Type.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_Select_FS_Type.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_create_cluster.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_create_cluster.jpg
index 66ac694e..66ac694e 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_create_cluster.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_create_cluster.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_login.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_login.jpg
index 282c1407..282c1407 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_login.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_login.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols.jpg
index e2aee777..e2aee777 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols_confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols_confirm.jpg
index af7ba50a..af7ba50a 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols_confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_multiple_vols_confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_register_cluster.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_register_cluster.jpg
index 6e39bc31..6e39bc31 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_register_cluster.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_register_cluster.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_removeBrick_confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_removeBrick_confirm.jpg
index 591b98dc..591b98dc 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_removeBrick_confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_removeBrick_confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_select_cluster.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_select_cluster.jpg
index 383aa719..383aa719 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_select_cluster.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_select_cluster.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_server_add_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_server_add_success.jpg
index 0f7dbfc5..0f7dbfc5 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_server_add_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_server_add_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_vol_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_vol_success.jpg
index 74931bc9..74931bc9 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_1.0_vol_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_1.0_vol_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_10.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_10.jpg
index 8a1bf08c..8a1bf08c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_10.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_10.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_Brick.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_Brick.jpg
index 59c99311..59c99311 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_Brick.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_Brick.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_Brick_confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_Brick_confirm.jpg
index 133ef15d..133ef15d 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_Brick_confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_Brick_confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_Brick_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_Brick_icon.jpg
index d613a544..d613a544 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_Brick_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_Brick_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_Server_Manual.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_Server_Manual.jpg
index 7789034c..7789034c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_Server_Manual.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_Server_Manual.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_brick.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_brick.jpg
index 4c5c2ae3..4c5c2ae3 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_brick.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_brick.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_brick_confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_brick_confirm.jpg
index a4b8a811..a4b8a811 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Add_brick_confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Add_brick_confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Alerts.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Alerts.jpg
index 1ae4e0aa..1ae4e0aa 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Alerts.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Alerts.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Bricks_Tab.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Bricks_Tab.jpg
index 1653d58b..1653d58b 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Bricks_Tab.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Bricks_Tab.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Change_Password.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Change_Password.jpg
index f8ab379a..f8ab379a 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Change_Password.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Change_Password.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Change_Password_Confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Change_Password_Confirm.jpg
index e13b22a1..e13b22a1 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Change_Password_Confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Change_Password_Confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Charts.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Charts.jpg
index b6d8edb0..b6d8edb0 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Charts.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Charts.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Clear_task_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Clear_task_icon.jpg
index ce31471c..ce31471c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Clear_task_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Clear_task_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary.jpg
index c6dcc77c..c6dcc77c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary_tab.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary_tab.jpg
index 8af1267e..8af1267e 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary_tab.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary_tab.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary_tab_new.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary_tab_new.jpg
index 53e83ce6..53e83ce6 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary_tab_new.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Cluster_Summary_tab_new.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Cluster.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Create_Cluster.jpg
index 6a21e8b9..6a21e8b9 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Cluster.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Create_Cluster.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Vol_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Create_Vol_icon.jpg
index 7529713c..7529713c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Vol_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Create_Vol_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Volume.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Create_Volume.jpg
index 2f8ecfca..2f8ecfca 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Volume.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Create_Volume.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Volume_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Create_Volume_success.jpg
index a128d182..a128d182 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Create_Volume_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Create_Volume_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol.jpg
index 51e97758..51e97758 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_Confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_Confirm.jpg
index c6fc98f2..c6fc98f2 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_Confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_Confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_multiple.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_multiple.jpg
index be89ddc7..be89ddc7 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_multiple.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_multiple.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_multiple_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_multiple_success.jpg
index fe037755..fe037755 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_multiple_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_multiple_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_success.jpg
index 1fdfb5f4..1fdfb5f4 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Delete_Vol_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Disk_tab.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Disk_tab.jpg
index 8bc1dc9e..8bc1dc9e 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Disk_tab.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Disk_tab.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Landing_Page.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Landing_Page.jpg
index 65e2bd9d..65e2bd9d 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Landing_Page.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Landing_Page.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Log_list.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Log_list.jpg
index 81ffa36c..81ffa36c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Log_list.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Log_list.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Login_Change_Pwd.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Login_Change_Pwd.jpg
index 27ed8be4..27ed8be4 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Login_Change_Pwd.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Login_Change_Pwd.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Login_Window.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Login_Window.jpg
index 7b684567..7b684567 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Login_Window.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Login_Window.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Migrate_Brick.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Migrate_Brick.jpg
index 69366171..69366171 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Migrate_Brick.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Migrate_Brick.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Migrate_Brick_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Migrate_Brick_success.jpg
index ef240296..ef240296 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Migrate_Brick_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Migrate_Brick_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_alerts.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Preferences_alerts.jpg
index d57c6adc..d57c6adc 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_alerts.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Preferences_alerts.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_charts.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Preferences_charts.jpg
index 7ae6ca8c..7ae6ca8c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_charts.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Preferences_charts.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_gluster.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Preferences_gluster.jpg
index b1348c59..b1348c59 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_gluster.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Preferences_gluster.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_terminal.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Preferences_terminal.jpg
index 78e33410..78e33410 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Preferences_terminal.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Preferences_terminal.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Rebalance_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Rebalance_icon.jpg
index 4d0f81e0..4d0f81e0 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Rebalance_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Rebalance_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Refresh.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Refresh.jpg
index 2fa0cf6a..2fa0cf6a 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Refresh.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Refresh.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Register_Cluster.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Register_Cluster.jpg
index 1da58638..1da58638 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Register_Cluster.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Register_Cluster.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_Confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_Confirm.jpg
index 45529823..45529823 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_Confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_Confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_icon.jpg
index 8f237ae5..8f237ae5 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_Brick_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_Server_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_Server_icon.jpg
index a62f4e60..a62f4e60 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_Server_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_Server_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_server.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_server.jpg
index e51eb1c6..e51eb1c6 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_server.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_server.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_server_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_server_success.jpg
index aaff5c0a..aaff5c0a 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Remove_server_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Remove_server_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Select_Cluster.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Select_Cluster.jpg
index 1198e0bf..1198e0bf 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Select_Cluster.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Select_Cluster.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Select_Cluster_progess.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Select_Cluster_progess.jpg
index 4f970da7..4f970da7 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Select_Cluster_progess.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Select_Cluster_progess.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Server_Disk.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Server_Disk.jpg
index 12a53350..12a53350 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Server_Disk.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Server_Disk.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Server_Summ.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Server_Summ.jpg
index 62169ee8..62169ee8 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Server_Summ.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Server_Summ.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Server_Summary_tab.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Server_Summary_tab.jpg
index ccef5b46..ccef5b46 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Server_Summary_tab.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Server_Summary_tab.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Server_Tab.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Server_Tab.jpg
index 387e4b38..387e4b38 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Server_Tab.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Server_Tab.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Single_Vol.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Single_Vol.jpg
index b88c3030..b88c3030 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Single_Vol.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Single_Vol.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Start_task_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Start_task_icon.jpg
index c864ed1b..c864ed1b 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Start_task_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Start_task_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Stop_Multiple_Vol.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Stop_Multiple_Vol.jpg
index cdf8f2f8..cdf8f2f8 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Stop_Multiple_Vol.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Stop_Multiple_Vol.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Stop_Vol.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Stop_Vol.jpg
index f6fd4f3b..f6fd4f3b 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Stop_Vol.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Stop_Vol.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Stop_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Stop_icon.jpg
index 5b39e612..5b39e612 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Stop_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Stop_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Task_tab.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Task_tab.jpg
index 3f0873a9..3f0873a9 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Task_tab.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Task_tab.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Terminal_window.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Terminal_window.jpg
index 603307e6..603307e6 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Terminal_window.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Terminal_window.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Toolbar.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Toolbar.jpg
index 1eeb7a0c..1eeb7a0c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Toolbar.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Toolbar.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_List.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Vol_List.jpg
index 04813d79..04813d79 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_List.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Vol_List.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_Options.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Vol_Options.jpg
index 36d99160..36d99160 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_Options.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Vol_Options.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_rebalance_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Vol_rebalance_success.jpg
index 1d06d499..1d06d499 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Vol_rebalance_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Vol_rebalance_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_Options.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_Options.jpg
index 4775a814..4775a814 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_Options.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_Options.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_Summary.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_Summary.jpg
index 23287308..23287308 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_Summary.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_Summary.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_Summary_tab.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_Summary_tab.jpg
index 1084c0f9..1084c0f9 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_Summary_tab.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_Summary_tab.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_logs.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_logs.jpg
index 6f70bc46..6f70bc46 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_logs.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_logs.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_properties.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_properties.jpg
index c31f4a09..c31f4a09 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Volume_properties.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Volume_properties.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_Volumes_tab.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_Volumes_tab.jpg
index 40d732ce..40d732ce 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_Volumes_tab.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_Volumes_tab.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_add_server_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_add_server_icon.jpg
index 693d94ff..693d94ff 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_add_server_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_add_server_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_change_pwd.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_change_pwd.jpg
index 625bbe27..625bbe27 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_change_pwd.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_change_pwd.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_create_vol (2).jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_create_vol (2).jpg
index 63f9cf9e..63f9cf9e 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_create_vol (2).jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_create_vol (2).jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_create_vol.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_create_vol.jpg
index 63f9cf9e..63f9cf9e 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_create_vol.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_create_vol.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_download_log_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_download_log_icon.jpg
index f5eb5fd3..f5eb5fd3 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_download_log_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_download_log_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_landing_page.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_landing_page.jpg
index eee50db5..eee50db5 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_landing_page.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_landing_page.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_log_criteria.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_log_criteria.jpg
index 112af00e..112af00e 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_log_criteria.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_log_criteria.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_migrate_brick.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_migrate_brick.jpg
index 08b4d358..08b4d358 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_migrate_brick.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_migrate_brick.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_migrate_brick_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_migrate_brick_icon.jpg
index f011d164..f011d164 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_migrate_brick_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_migrate_brick_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_pause_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_pause_icon.jpg
index c9153cf1..c9153cf1 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_pause_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_pause_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_pwd_change_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_pwd_change_success.jpg
index c4f12744..c4f12744 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_pwd_change_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_pwd_change_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_rebalance_vol.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_rebalance_vol.jpg
index 9e310025..9e310025 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_rebalance_vol.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_rebalance_vol.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_remove_server_confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_remove_server_confirm.jpg
index a7c1d8ed..a7c1d8ed 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_remove_server_confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_remove_server_confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_remove_volume_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_remove_volume_icon.jpg
index e5626e4c..e5626e4c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_remove_volume_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_remove_volume_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_server_summary.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_server_summary.jpg
index 8a1bf08c..8a1bf08c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_server_summary.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_server_summary.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_setting_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_setting_icon.jpg
index 049d15aa..049d15aa 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_setting_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_setting_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_settings.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_settings.jpg
index bd655794..bd655794 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_settings.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_settings.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_start_vol_Multiple.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_start_vol_Multiple.jpg
index 99f3895f..99f3895f 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_start_vol_Multiple.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_start_vol_Multiple.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_start_vol_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_start_vol_icon.jpg
index f9c78eb7..f9c78eb7 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_start_vol_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_start_vol_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_start_vol_success.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_start_vol_success.jpg
index 0aa6668f..0aa6668f 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_start_vol_success.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_start_vol_success.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_stop_vol_Multiple.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_stop_vol_Multiple.jpg
index 99f3895f..99f3895f 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_stop_vol_Multiple.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_stop_vol_Multiple.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_stop_vol_icon.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_stop_vol_icon.jpg
index 2c5f7c2f..2c5f7c2f 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_stop_vol_icon.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_stop_vol_icon.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_terminal_Settings.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_terminal_Settings.jpg
index cf67682c..cf67682c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_terminal_Settings.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_terminal_Settings.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMC_terminal_toolbar.jpg b/src/org.gluster.storage.management.console.help/html/images/GMC_terminal_toolbar.jpg
index d2d79b58..d2d79b58 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMC_terminal_toolbar.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMC_terminal_toolbar.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GMG_Architecture.jpg b/src/org.gluster.storage.management.console.help/html/images/GMG_Architecture.jpg
index 2c606b59..2c606b59 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GMG_Architecture.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GMG_Architecture.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GlusterFS_3.2_Architecture.jpg b/src/org.gluster.storage.management.console.help/html/images/GlusterFS_3.2_Architecture.jpg
index b093fc29..b093fc29 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GlusterFS_3.2_Architecture.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GlusterFS_3.2_Architecture.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/GlusterFS_3.2_Architecture.png b/src/org.gluster.storage.management.console.help/html/images/GlusterFS_3.2_Architecture.png
index b506db1f..b506db1f 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GlusterFS_3.2_Architecture.png
+++ b/src/org.gluster.storage.management.console.help/html/images/GlusterFS_3.2_Architecture.png
diff --git a/src/com.gluster.storage.management.console.help/html/images/GlusterMC_Architecture.jpg b/src/org.gluster.storage.management.console.help/html/images/GlusterMC_Architecture.jpg
index 64618ddf..64618ddf 100644
--- a/src/com.gluster.storage.management.console.help/html/images/GlusterMC_Architecture.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/GlusterMC_Architecture.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/Migration.png b/src/org.gluster.storage.management.console.help/html/images/Migration.png
index 4ed6e054..4ed6e054 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Migration.png
+++ b/src/org.gluster.storage.management.console.help/html/images/Migration.png
diff --git a/src/com.gluster.storage.management.console.help/html/images/Preferences-alerts .png b/src/org.gluster.storage.management.console.help/html/images/Preferences-alerts .png
index d7cefac3..d7cefac3 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Preferences-alerts .png
+++ b/src/org.gluster.storage.management.console.help/html/images/Preferences-alerts .png
diff --git a/src/com.gluster.storage.management.console.help/html/images/Preferences-charts.png b/src/org.gluster.storage.management.console.help/html/images/Preferences-charts.png
index 89cabb06..89cabb06 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Preferences-charts.png
+++ b/src/org.gluster.storage.management.console.help/html/images/Preferences-charts.png
diff --git a/src/com.gluster.storage.management.console.help/html/images/Preferences-gluster .png b/src/org.gluster.storage.management.console.help/html/images/Preferences-gluster .png
index f279b9fb..f279b9fb 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Preferences-gluster .png
+++ b/src/org.gluster.storage.management.console.help/html/images/Preferences-gluster .png
diff --git a/src/com.gluster.storage.management.console.help/html/images/Running tasks & alerts.png b/src/org.gluster.storage.management.console.help/html/images/Running tasks & alerts.png
index 7f3b192f..7f3b192f 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Running tasks & alerts.png
+++ b/src/org.gluster.storage.management.console.help/html/images/Running tasks & alerts.png
diff --git a/src/com.gluster.storage.management.console.help/html/images/Stop_Vol.jpg b/src/org.gluster.storage.management.console.help/html/images/Stop_Vol.jpg
index 124a1180..124a1180 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Stop_Vol.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/Stop_Vol.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/Stop_Vol_confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/Stop_Vol_confirm.jpg
index ad87228b..ad87228b 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Stop_Vol_confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/Stop_Vol_confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/Stop_Vol_multiple.jpg b/src/org.gluster.storage.management.console.help/html/images/Stop_Vol_multiple.jpg
index 6955996c..6955996c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Stop_Vol_multiple.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/Stop_Vol_multiple.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/Stop_Vol_multiple_confirm.jpg b/src/org.gluster.storage.management.console.help/html/images/Stop_Vol_multiple_confirm.jpg
index 581bf389..581bf389 100644
--- a/src/com.gluster.storage.management.console.help/html/images/Stop_Vol_multiple_confirm.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/Stop_Vol_multiple_confirm.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/discovered_servers.png b/src/org.gluster.storage.management.console.help/html/images/discovered_servers.png
index 2a4e2c5c..2a4e2c5c 100644
--- a/src/com.gluster.storage.management.console.help/html/images/discovered_servers.png
+++ b/src/org.gluster.storage.management.console.help/html/images/discovered_servers.png
diff --git a/src/com.gluster.storage.management.console.help/html/images/java-web-start.jpg b/src/org.gluster.storage.management.console.help/html/images/java-web-start.jpg
index 2a445b60..2a445b60 100644
--- a/src/com.gluster.storage.management.console.help/html/images/java-web-start.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/java-web-start.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/java_web_start.jpg b/src/org.gluster.storage.management.console.help/html/images/java_web_start.jpg
index 2a445b60..2a445b60 100644
--- a/src/com.gluster.storage.management.console.help/html/images/java_web_start.jpg
+++ b/src/org.gluster.storage.management.console.help/html/images/java_web_start.jpg
diff --git a/src/com.gluster.storage.management.console.help/html/images/login-dialog.png b/src/org.gluster.storage.management.console.help/html/images/login-dialog.png
index 50051b96..50051b96 100644
--- a/src/com.gluster.storage.management.console.help/html/images/login-dialog.png
+++ b/src/org.gluster.storage.management.console.help/html/images/login-dialog.png
diff --git a/src/com.gluster.storage.management.console.help/html/reference/maintopic.html b/src/org.gluster.storage.management.console.help/html/reference/maintopic.html
index 8caa4cc2..8caa4cc2 100644
--- a/src/com.gluster.storage.management.console.help/html/reference/maintopic.html
+++ b/src/org.gluster.storage.management.console.help/html/reference/maintopic.html
diff --git a/src/com.gluster.storage.management.console.help/html/reference/subtopic.html b/src/org.gluster.storage.management.console.help/html/reference/subtopic.html
index c68dc748..c68dc748 100644
--- a/src/com.gluster.storage.management.console.help/html/reference/subtopic.html
+++ b/src/org.gluster.storage.management.console.help/html/reference/subtopic.html
diff --git a/src/com.gluster.storage.management.console.help/html/reference/subtopic2.html b/src/org.gluster.storage.management.console.help/html/reference/subtopic2.html
index e5e31cd1..e5e31cd1 100644
--- a/src/com.gluster.storage.management.console.help/html/reference/subtopic2.html
+++ b/src/org.gluster.storage.management.console.help/html/reference/subtopic2.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/access_gmc_jws.html b/src/org.gluster.storage.management.console.help/html/tasks/access_gmc_jws.html
index 79c42427..79c42427 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/access_gmc_jws.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/access_gmc_jws.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/add_brick.html b/src/org.gluster.storage.management.console.help/html/tasks/add_brick.html
index de0dc6ea..de0dc6ea 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/add_brick.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/add_brick.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/add_servers.html b/src/org.gluster.storage.management.console.help/html/tasks/add_servers.html
index b554a1dc..b554a1dc 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/add_servers.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/add_servers.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/configure_gmc.html b/src/org.gluster.storage.management.console.help/html/tasks/configure_gmc.html
index 3c385014..3c385014 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/configure_gmc.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/configure_gmc.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/create_cluster.html b/src/org.gluster.storage.management.console.help/html/tasks/create_cluster.html
index a2e0dff8..a2e0dff8 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/create_cluster.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/create_cluster.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/create_volume.html b/src/org.gluster.storage.management.console.help/html/tasks/create_volume.html
index 814835ec..814835ec 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/create_volume.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/create_volume.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/delete_brick.html b/src/org.gluster.storage.management.console.help/html/tasks/delete_brick.html
index a5de99af..a5de99af 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/delete_brick.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/delete_brick.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/delete_volume.html b/src/org.gluster.storage.management.console.help/html/tasks/delete_volume.html
index 43d51231..43d51231 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/delete_volume.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/delete_volume.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/deploy_gmc_dedicated_host.html b/src/org.gluster.storage.management.console.help/html/tasks/deploy_gmc_dedicated_host.html
index 688fa54d..688fa54d 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/deploy_gmc_dedicated_host.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/deploy_gmc_dedicated_host.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/display_log.html b/src/org.gluster.storage.management.console.help/html/tasks/display_log.html
index 4575fd18..4575fd18 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/display_log.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/display_log.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/download_log.html b/src/org.gluster.storage.management.console.help/html/tasks/download_log.html
index 4d36b0c4..4d36b0c4 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/download_log.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/download_log.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/initialize_disk.html b/src/org.gluster.storage.management.console.help/html/tasks/initialize_disk.html
index d50e4a9f..d50e4a9f 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/initialize_disk.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/initialize_disk.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/logging.html b/src/org.gluster.storage.management.console.help/html/tasks/logging.html
index e936e7ed..e936e7ed 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/logging.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/logging.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/maintopic (3).html b/src/org.gluster.storage.management.console.help/html/tasks/maintopic (3).html
index dccb80ab..dccb80ab 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/maintopic (3).html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/maintopic (3).html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/maintopic.html b/src/org.gluster.storage.management.console.help/html/tasks/maintopic.html
index dccb80ab..dccb80ab 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/maintopic.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/maintopic.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/migrate_brick.html b/src/org.gluster.storage.management.console.help/html/tasks/migrate_brick.html
index b5202f25..b5202f25 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/migrate_brick.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/migrate_brick.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/rebalance_vol.html b/src/org.gluster.storage.management.console.help/html/tasks/rebalance_vol.html
index 63bf3050..63bf3050 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/rebalance_vol.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/rebalance_vol.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/register_cluster.html b/src/org.gluster.storage.management.console.help/html/tasks/register_cluster.html
index ef1c66bd..ef1c66bd 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/register_cluster.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/register_cluster.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/remove_brick.html b/src/org.gluster.storage.management.console.help/html/tasks/remove_brick.html
index fbbfb89e..fbbfb89e 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/remove_brick.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/remove_brick.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/remove_server.html b/src/org.gluster.storage.management.console.help/html/tasks/remove_server.html
index d432143d..d432143d 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/remove_server.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/remove_server.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/select_cluster.html b/src/org.gluster.storage.management.console.help/html/tasks/select_cluster.html
index a3dc9466..a3dc9466 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/select_cluster.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/select_cluster.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/start_vol.html b/src/org.gluster.storage.management.console.help/html/tasks/start_vol.html
index 4b3e76d6..4b3e76d6 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/start_vol.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/start_vol.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/starting_gmc.html b/src/org.gluster.storage.management.console.help/html/tasks/starting_gmc.html
index 933e72ed..933e72ed 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/starting_gmc.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/starting_gmc.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/stop_vol.html b/src/org.gluster.storage.management.console.help/html/tasks/stop_vol.html
index c97d1d91..c97d1d91 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/stop_vol.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/stop_vol.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic.html b/src/org.gluster.storage.management.console.help/html/tasks/subtopic.html
index 6dccc35e..6dccc35e 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/subtopic.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/subtopic.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic2 (3).html b/src/org.gluster.storage.management.console.help/html/tasks/subtopic2 (3).html
index 5ece5749..5ece5749 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/subtopic2 (3).html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/subtopic2 (3).html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic2.html b/src/org.gluster.storage.management.console.help/html/tasks/subtopic2.html
index 5ece5749..5ece5749 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/subtopic2.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/subtopic2.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic3.html b/src/org.gluster.storage.management.console.help/html/tasks/subtopic3.html
index 6dccc35e..6dccc35e 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/subtopic3.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/subtopic3.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic4.html b/src/org.gluster.storage.management.console.help/html/tasks/subtopic4.html
index 6dccc35e..6dccc35e 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/subtopic4.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/subtopic4.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic5.html b/src/org.gluster.storage.management.console.help/html/tasks/subtopic5.html
index 6dccc35e..6dccc35e 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/subtopic5.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/subtopic5.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/subtopic6.html b/src/org.gluster.storage.management.console.help/html/tasks/subtopic6.html
index 6dccc35e..6dccc35e 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/subtopic6.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/subtopic6.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/tune_vol_opt.html b/src/org.gluster.storage.management.console.help/html/tasks/tune_vol_opt.html
index b9dc0e72..b9dc0e72 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/tune_vol_opt.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/tune_vol_opt.html
diff --git a/src/com.gluster.storage.management.console.help/html/tasks/volumes.html b/src/org.gluster.storage.management.console.help/html/tasks/volumes.html
index 84532085..84532085 100644
--- a/src/com.gluster.storage.management.console.help/html/tasks/volumes.html
+++ b/src/org.gluster.storage.management.console.help/html/tasks/volumes.html
diff --git a/src/com.gluster.storage.management.console.help/html/toc.html b/src/org.gluster.storage.management.console.help/html/toc.html
index 83401387..83401387 100644
--- a/src/com.gluster.storage.management.console.help/html/toc.html
+++ b/src/org.gluster.storage.management.console.help/html/toc.html
diff --git a/src/org.gluster.storage.management.console.help/plugin.xml b/src/org.gluster.storage.management.console.help/plugin.xml
new file mode 100644
index 00000000..7bee4143
--- /dev/null
+++ b/src/org.gluster.storage.management.console.help/plugin.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<!--
+    Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+    This file is part of Gluster Management Console.
+   
+    Gluster Management Console 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.
+   
+    Gluster Management Console 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/>.
+ -->
+
+<plugin>
+
+   <extension
+         point="org.eclipse.help.toc">
+      <toc
+            file="toc.xml"
+            primary="true">
+      </toc>
+      <toc
+            file="tocconcepts.xml">
+      </toc>
+      <toc
+            file="tocgettingstarted.xml">
+      </toc>
+      <toc
+            file="tocreference.xml">
+      </toc>
+      <toc
+            file="toctasks.xml"
+            primary="true">
+      </toc>
+   </extension>
+
+</plugin>
diff --git a/src/org.gluster.storage.management.console.help/toc.xml b/src/org.gluster.storage.management.console.help/toc.xml
new file mode 100644
index 00000000..29f2b401
--- /dev/null
+++ b/src/org.gluster.storage.management.console.help/toc.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+<!--
+    Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+    This file is part of Gluster Management Console.
+   
+    Gluster Management Console 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.
+   
+    Gluster Management Console 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/>.
+ -->
+
+<toc label="Gluster Management Console - Help" topic="html/toc.html">
+   <topic label="Concepts">
+      <anchor id="concepts"/>
+   </topic>
+   <topic label="Getting Started">
+      <anchor id="gettingstarted"/>
+   </topic>
+   <topic label="Tasks">
+      <anchor id="tasks"/>
+   </topic>
+</toc>
diff --git a/src/org.gluster.storage.management.console.help/tocconcepts.xml b/src/org.gluster.storage.management.console.help/tocconcepts.xml
new file mode 100644
index 00000000..cfb51e56
--- /dev/null
+++ b/src/org.gluster.storage.management.console.help/tocconcepts.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+<!--
+    Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+    This file is part of Gluster Management Console.
+   
+    Gluster Management Console 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.
+   
+    Gluster Management Console 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/>.
+ -->
+
+<toc label="Concepts" link_to="toc.xml#concepts">
+	<topic label="Gluster FileSystem"  href="html/concepts/gluster_fs.html">
+	<topic label="Common Cluster Terminologies"  href="html/concepts/common_terms.html" /> 
+	</topic>
+ <topic href="html/concepts/about_gmg.html" label="About Gluster Management Gateway">
+ </topic> 
+	<topic label="About Gluster Management Console"  href="html/concepts/about_gmc.html"> 
+	</topic> 
+</toc>
diff --git a/src/com.gluster.storage.management.console.help/tocgettingstarted.xml b/src/org.gluster.storage.management.console.help/tocgettingstarted.xml
index e25ec655..afeae4c8 100644
--- a/src/com.gluster.storage.management.console.help/tocgettingstarted.xml
+++ b/src/org.gluster.storage.management.console.help/tocgettingstarted.xml
@@ -1,15 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
+<!--
+    Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+    This file is part of Gluster Management Console.
+   
+    Gluster Management Console 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.
+   
+    Gluster Management Console 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/>.
+ -->
 
 <toc label="Getting Started" link_to="toc.xml#gettingstarted">
-   <topic label="Preparing to Install Gluster Management Gateway">
-      <topic href="html/gettingstarted/check_req_gmg.html" label="Checking the Gluster Management Gateway Minimum Requirements">
-      </topic>
-      <topic href="html/gettingstarted/install_gmg.html" label="Installing the Gluster Management Gateway">
-      </topic>
-      <topic href="html/gettingstarted/install_gmg_backend.html" label="Installing Gluster Management Gateway Backend Packages">
-      </topic>
-   </topic>
    <topic label="Setting up the Gluster Management Console">
       <topic href="html/gettingstarted/check_req_client.html" label="Checking the Minimum Requirements on the Client Machine">
       </topic>
diff --git a/src/org.gluster.storage.management.console.help/tocreference.xml b/src/org.gluster.storage.management.console.help/tocreference.xml
new file mode 100644
index 00000000..01363023
--- /dev/null
+++ b/src/org.gluster.storage.management.console.help/tocreference.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?NLS TYPE="org.eclipse.help.toc"?>
+<!--
+    Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+    This file is part of Gluster Management Console.
+   
+    Gluster Management Console 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.
+   
+    Gluster Management Console 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/>.
+ -->
+
+<toc label="Reference" link_to="toc.xml#reference"> 
+	<topic label="Main Topic"  href="html/reference/maintopic.html"> 
+		<topic label="Sub Topic" href="html/reference/subtopic.html" /> 
+	</topic>
+	<topic label="Main Topic 2">
+		<topic label="Sub Topic 2" href="html/reference/subtopic2.html" /> 
+	</topic> 
+</toc>
diff --git a/src/com.gluster.storage.management.console.help/toctasks.xml b/src/org.gluster.storage.management.console.help/toctasks.xml
index ced68d9f..3ae97388 100644
--- a/src/com.gluster.storage.management.console.help/toctasks.xml
+++ b/src/org.gluster.storage.management.console.help/toctasks.xml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?NLS TYPE="org.eclipse.help.toc"?>
+<!--
+    Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+    This file is part of Gluster Management Console.
+   
+    Gluster Management Console 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.
+   
+    Gluster Management Console 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/>.
+ -->
 
 <toc label="Tasks" link_to="toc.xml#tasks">
  <topic label="Cluster">
diff --git a/src/com.gluster.storage.management.console/.classpath b/src/org.gluster.storage.management.console/.classpath
index ad32c83a..ad32c83a 100644
--- a/src/com.gluster.storage.management.console/.classpath
+++ b/src/org.gluster.storage.management.console/.classpath
diff --git a/src/com.gluster.storage.management.console/.project b/src/org.gluster.storage.management.console/.project
index 179cac7b..dff371c7 100644
--- a/src/com.gluster.storage.management.console/.project
+++ b/src/org.gluster.storage.management.console/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.console</name>
+	<name>org.gluster.storage.management.console</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.console/.settings/org.eclipse.jdt.core.prefs b/src/org.gluster.storage.management.console/.settings/org.eclipse.jdt.core.prefs
index abf7cf5a..abf7cf5a 100644
--- a/src/com.gluster.storage.management.console/.settings/org.eclipse.jdt.core.prefs
+++ b/src/org.gluster.storage.management.console/.settings/org.eclipse.jdt.core.prefs
diff --git a/src/com.gluster.storage.management.console/META-INF/MANIFEST.MF b/src/org.gluster.storage.management.console/META-INF/MANIFEST.MF
index 4194aae3..fb2576f9 100644
--- a/src/com.gluster.storage.management.console/META-INF/MANIFEST.MF
+++ b/src/org.gluster.storage.management.console/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: glustersp-gui
-Bundle-SymbolicName: com.gluster.storage.management.console;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: com.gluster.storage.management.console.Activator
+Bundle-SymbolicName: org.gluster.storage.management.console;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.gluster.storage.management.console.Activator
 Bundle-Vendor: Gluster
 Require-Bundle: org.eclipse.ui;bundle-version="3.6.1",
  org.eclipse.core.runtime;bundle-version="3.6.0",
  org.eclipse.ui.forms;bundle-version="3.5.2",
  org.eclipse.rcp;bundle-version="3.6.0",
- com.gluster.storage.management.core;bundle-version="1.0.0",
- com.gluster.storage.management.client;bundle-version="1.0.0",
+ org.gluster.storage.management.core;bundle-version="1.0.0",
+ org.gluster.storage.management.client;bundle-version="1.0.0",
  org.eclipse.core.databinding;bundle-version="1.3.100",
  org.eclipse.jface.databinding;bundle-version="1.4.0",
  org.eclipse.core.databinding.property;bundle-version="1.3.0",
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.1",
  com.richclientgui.rcptoolbox;bundle-version="1.0.5",
  org.eclipse.core.resources,
  org.apache.commons.lang;bundle-version="2.3.0",
- com.gluster.storage.management.console.help;bundle-version="1.0.0",
+ org.gluster.storage.management.console.help;bundle-version="1.0.0",
  org.eclipse.tm.terminal;bundle-version="3.1.0",
  org.eclipse.tm.terminal.ssh;bundle-version="2.1.0",
  org.eclipse.tm.terminal.view;bundle-version="2.2.0"
diff --git a/src/org.gluster.storage.management.console/buckminster.cspex b/src/org.gluster.storage.management.console/buckminster.cspex
new file mode 100644
index 00000000..88e2c953
--- /dev/null
+++ b/src/org.gluster.storage.management.console/buckminster.cspex
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+    This file is part of Gluster Management Console.
+   
+    Gluster Management Console 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.
+   
+    Gluster Management Console 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/>.
+-->
+<cspecExtension xmlns:com="http://www.eclipse.org/buckminster/Common-1.0"
+	xmlns="http://www.eclipse.org/buckminster/CSpec-1.0">
+	<actions>
+		<public name="update.version" actor="ant">
+			<actorProperties>
+				<property key="buildFile" value="build/glustermc.ant" />
+				<property key="targets" value="update.version" />
+			</actorProperties>
+		</public>
+	</actions>
+</cspecExtension>
diff --git a/src/org.gluster.storage.management.console/build.properties b/src/org.gluster.storage.management.console/build.properties
new file mode 100644
index 00000000..b17cfb6d
--- /dev/null
+++ b/src/org.gluster.storage.management.console/build.properties
@@ -0,0 +1,32 @@
+###############################################################################
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Console.
+#
+# Gluster Management Console 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.
+#
+# Gluster Management Console 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/>.
+###############################################################################
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .,\
+               icons/,\
+               splash.bmp,\
+               images/,\
+               plugin.xml,\
+               preferences.ini,\
+               plugin.properties
+src.includes = icons/,\
+               splash.bmp,\
+               images/,\
+               preferences.ini
diff --git a/src/org.gluster.storage.management.console/build/glustermc.ant b/src/org.gluster.storage.management.console/build/glustermc.ant
new file mode 100644
index 00000000..2626aec7
--- /dev/null
+++ b/src/org.gluster.storage.management.console/build/glustermc.ant
@@ -0,0 +1,25 @@
+<!--
+    Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+    This file is part of Gluster Management Console.
+   
+    Gluster Management Console 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.
+   
+    Gluster Management Console 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/>.
+-->
+<project>
+	<property name="plugin.properties.file" value="${basedir}/plugin.properties" />
+
+	<target name='update.version'>
+		<replace file="${plugin.properties.file}" token="@VERSION@" value="${product.version}" />
+	</target>
+</project>
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/arrow-down.png b/src/org.gluster.storage.management.console/icons/tango/16x16/arrow-down.png
index 3dd7fccd..3dd7fccd 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/arrow-down.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/arrow-down.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/arrow-up.png b/src/org.gluster.storage.management.console/icons/tango/16x16/arrow-up.png
index fa9a7d71..fa9a7d71 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/arrow-up.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/arrow-up.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/bricks.png b/src/org.gluster.storage.management.console/icons/tango/16x16/bricks.png
index ed381bd5..ed381bd5 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/bricks.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/bricks.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/close_task.png b/src/org.gluster.storage.management.console/icons/tango/16x16/close_task.png
index 933272b4..933272b4 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/close_task.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/close_task.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/cluster.png b/src/org.gluster.storage.management.console/icons/tango/16x16/cluster.png
index c9348a21..c9348a21 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/cluster.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/cluster.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-available.png b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-available.png
index c3c5f3b1..c3c5f3b1 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-available.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-available.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-error.png b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-error.png
index 314fa2f3..314fa2f3 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-error.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-error.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-initialisation.png b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-initialisation.png
index 71d0107c..71d0107c 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-initialisation.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-initialisation.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-inuse.png b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-inuse.png
index e4954c6a..e4954c6a 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-inuse.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-inuse.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-uninitialized.png b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-uninitialized.png
index ba3b48a4..ba3b48a4 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/disk-uninitialized.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/disk-uninitialized.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/disk.png b/src/org.gluster.storage.management.console/icons/tango/16x16/disk.png
index b74fb20e..b74fb20e 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/disk.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/disk.png
diff --git a/src/org.gluster.storage.management.console/icons/tango/16x16/error.png b/src/org.gluster.storage.management.console/icons/tango/16x16/error.png
new file mode 100644
index 00000000..a9e4ff39
--- /dev/null
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/error.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/gluster_icon.png b/src/org.gluster.storage.management.console/icons/tango/16x16/gluster_icon.png
index f92e472d..f92e472d 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/gluster_icon.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/gluster_icon.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/help.png b/src/org.gluster.storage.management.console/icons/tango/16x16/help.png
index f25fc3fb..f25fc3fb 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/help.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/help.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/logs.png b/src/org.gluster.storage.management.console/icons/tango/16x16/logs.png
index 124f322f..124f322f 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/logs.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/logs.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/offline-brick.png b/src/org.gluster.storage.management.console/icons/tango/16x16/offline-brick.png
index 48812db8..48812db8 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/offline-brick.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/offline-brick.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/online-brick.png b/src/org.gluster.storage.management.console/icons/tango/16x16/online-brick.png
index da895838..da895838 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/online-brick.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/online-brick.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/pause.png b/src/org.gluster.storage.management.console/icons/tango/16x16/pause.png
index 04923149..04923149 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/pause.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/pause.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/question.png b/src/org.gluster.storage.management.console/icons/tango/16x16/question.png
index 30a47032..30a47032 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/question.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/question.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/running-task.png b/src/org.gluster.storage.management.console/icons/tango/16x16/running-task.png
index ad679b8b..ad679b8b 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/running-task.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/running-task.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/server.png b/src/org.gluster.storage.management.console/icons/tango/16x16/server.png
index d0b397be..d0b397be 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/server.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/server.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/servers.png b/src/org.gluster.storage.management.console/icons/tango/16x16/servers.png
index 0efee57e..0efee57e 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/servers.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/servers.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/settings.png b/src/org.gluster.storage.management.console/icons/tango/16x16/settings.png
index d90ab661..d90ab661 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/settings.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/settings.png
diff --git a/src/org.gluster.storage.management.console/icons/tango/16x16/start-offline-bricks-disabled.png b/src/org.gluster.storage.management.console/icons/tango/16x16/start-offline-bricks-disabled.png
new file mode 100644
index 00000000..60d20d65
--- /dev/null
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/start-offline-bricks-disabled.png
diff --git a/src/org.gluster.storage.management.console/icons/tango/16x16/start-offline-bricks.png b/src/org.gluster.storage.management.console/icons/tango/16x16/start-offline-bricks.png
new file mode 100644
index 00000000..fcd22fa5
--- /dev/null
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/start-offline-bricks.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/start.png b/src/org.gluster.storage.management.console/icons/tango/16x16/start.png
index d4413259..d4413259 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/start.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/start.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/status-offline.png b/src/org.gluster.storage.management.console/icons/tango/16x16/status-offline.png
index dbd0204e..dbd0204e 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/status-offline.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/status-offline.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/status-online.png b/src/org.gluster.storage.management.console/icons/tango/16x16/status-online.png
index a31ba599..a31ba599 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/status-online.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/status-online.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/stop.png b/src/org.gluster.storage.management.console/icons/tango/16x16/stop.png
index 8f591c63..8f591c63 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/stop.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/stop.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/task-completed.png b/src/org.gluster.storage.management.console/icons/tango/16x16/task-completed.png
index 5de2361a..5de2361a 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/task-completed.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/task-completed.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/task-error.png b/src/org.gluster.storage.management.console/icons/tango/16x16/task-error.png
index 1fc66ad2..1fc66ad2 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/task-error.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/task-error.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/utilities-terminal.png b/src/org.gluster.storage.management.console/icons/tango/16x16/utilities-terminal.png
index c5b797a7..c5b797a7 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/utilities-terminal.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/utilities-terminal.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/view-refresh.png b/src/org.gluster.storage.management.console/icons/tango/16x16/view-refresh.png
index 3fd71d6e..3fd71d6e 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/view-refresh.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/view-refresh.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/volume-create.png b/src/org.gluster.storage.management.console/icons/tango/16x16/volume-create.png
index 628f4d50..628f4d50 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/volume-create.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/volume-create.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/volume-options.png b/src/org.gluster.storage.management.console/icons/tango/16x16/volume-options.png
index d7665cb7..d7665cb7 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/volume-options.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/volume-options.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/volume.png b/src/org.gluster.storage.management.console/icons/tango/16x16/volume.png
index 41376404..41376404 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/volume.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/volume.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/16x16/volumes.png b/src/org.gluster.storage.management.console/icons/tango/16x16/volumes.png
index 18c2ad8b..18c2ad8b 100644
--- a/src/com.gluster.storage.management.console/icons/tango/16x16/volumes.png
+++ b/src/org.gluster.storage.management.console/icons/tango/16x16/volumes.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/disk-initialisation.png b/src/org.gluster.storage.management.console/icons/tango/22x22/disk-initialisation.png
index 73ecf4c0..73ecf4c0 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/disk-initialisation.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/disk-initialisation.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/high-memory-usage.png b/src/org.gluster.storage.management.console/icons/tango/22x22/high-memory-usage.png
index b7c166ab..b7c166ab 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/high-memory-usage.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/high-memory-usage.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/low-diskspace.png b/src/org.gluster.storage.management.console/icons/tango/22x22/low-diskspace.png
index 983012ad..983012ad 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/low-diskspace.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/low-diskspace.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/migrate-brick.png b/src/org.gluster.storage.management.console/icons/tango/22x22/migrate-brick.png
index 48a66c8c..48a66c8c 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/migrate-brick.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/migrate-brick.png
diff --git a/src/org.gluster.storage.management.console/icons/tango/22x22/offline-brick.png b/src/org.gluster.storage.management.console/icons/tango/22x22/offline-brick.png
new file mode 100644
index 00000000..3a627598
--- /dev/null
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/offline-brick.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/offline-server.png b/src/org.gluster.storage.management.console/icons/tango/22x22/offline-server.png
index 5900c724..5900c724 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/offline-server.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/offline-server.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/offline-volume.png b/src/org.gluster.storage.management.console/icons/tango/22x22/offline-volume.png
index fa3a64f9..fa3a64f9 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/offline-volume.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/offline-volume.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/server-warning.png b/src/org.gluster.storage.management.console/icons/tango/22x22/server-warning.png
index 9e2da0bc..9e2da0bc 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/server-warning.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/server-warning.png
diff --git a/src/org.gluster.storage.management.console/icons/tango/22x22/start-offline-bricks-disabled.png b/src/org.gluster.storage.management.console/icons/tango/22x22/start-offline-bricks-disabled.png
new file mode 100644
index 00000000..69fb53de
--- /dev/null
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/start-offline-bricks-disabled.png
diff --git a/src/org.gluster.storage.management.console/icons/tango/22x22/start-offline-bricks.png b/src/org.gluster.storage.management.console/icons/tango/22x22/start-offline-bricks.png
new file mode 100644
index 00000000..8d0e2878
--- /dev/null
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/start-offline-bricks.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/system-search.png b/src/org.gluster.storage.management.console/icons/tango/22x22/system-search.png
index 4e522b23..4e522b23 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/system-search.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/system-search.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/utilities-terminal.png b/src/org.gluster.storage.management.console/icons/tango/22x22/utilities-terminal.png
index ceb0fb99..ceb0fb99 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/utilities-terminal.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/utilities-terminal.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/22x22/volume-rebalance.png b/src/org.gluster.storage.management.console/icons/tango/22x22/volume-rebalance.png
index 4539822c..4539822c 100644
--- a/src/com.gluster.storage.management.console/icons/tango/22x22/volume-rebalance.png
+++ b/src/org.gluster.storage.management.console/icons/tango/22x22/volume-rebalance.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/add-brick-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/add-brick-disabled.png
index 925c8b44..925c8b44 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/add-brick-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/add-brick-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/add-brick.png b/src/org.gluster.storage.management.console/icons/tango/32x32/add-brick.png
index 81304ab4..81304ab4 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/add-brick.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/add-brick.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/add-server.png b/src/org.gluster.storage.management.console/icons/tango/32x32/add-server.png
index 29a512f2..29a512f2 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/add-server.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/add-server.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/clear-task-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/clear-task-disabled.png
index af8884e3..af8884e3 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/clear-task-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/clear-task-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/clear-task.png b/src/org.gluster.storage.management.console/icons/tango/32x32/clear-task.png
index db17be6b..db17be6b 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/clear-task.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/clear-task.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/commit-task-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/commit-task-disabled.png
index 89ccbd4d..89ccbd4d 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/commit-task-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/commit-task-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/commit-task.png b/src/org.gluster.storage.management.console/icons/tango/32x32/commit-task.png
index ff0c9452..ff0c9452 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/commit-task.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/commit-task.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/create-volume-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/create-volume-disabled.png
index d7b69f97..d7b69f97 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/create-volume-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/create-volume-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/create-volume.png b/src/org.gluster.storage.management.console/icons/tango/32x32/create-volume.png
index b43289b6..b43289b6 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/create-volume.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/create-volume.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/disk.png b/src/org.gluster.storage.management.console/icons/tango/32x32/disk.png
index b34d8b77..b34d8b77 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/disk.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/disk.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/download-log.png b/src/org.gluster.storage.management.console/icons/tango/32x32/download-log.png
index 62bf9d7e..62bf9d7e 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/download-log.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/download-log.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/help.png b/src/org.gluster.storage.management.console/icons/tango/32x32/help.png
index d60425f7..d60425f7 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/help.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/help.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/log-rotate.png b/src/org.gluster.storage.management.console/icons/tango/32x32/log-rotate.png
index a1ceebbf..a1ceebbf 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/log-rotate.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/log-rotate.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/logs.png b/src/org.gluster.storage.management.console/icons/tango/32x32/logs.png
index b62959e4..b62959e4 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/logs.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/logs.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/migrate-brick-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/migrate-brick-disabled.png
index 8a1e82a7..8a1e82a7 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/migrate-brick-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/migrate-brick-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/migrate-brick.png b/src/org.gluster.storage.management.console/icons/tango/32x32/migrate-brick.png
index 999332a5..999332a5 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/migrate-brick.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/migrate-brick.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/pause-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/pause-disabled.png
index 7b023e3d..7b023e3d 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/pause-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/pause-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/pause.png b/src/org.gluster.storage.management.console/icons/tango/32x32/pause.png
index 597bc014..597bc014 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/pause.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/pause.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-brick-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-brick-disabled.png
index 8dbbf3c1..8dbbf3c1 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-brick-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-brick-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-brick.png b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-brick.png
index 83a657a2..83a657a2 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-brick.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-brick.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-server-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-server-disabled.png
index 3f31d216..3f31d216 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-server-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-server-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-server.png b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-server.png
index fba00869..fba00869 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-server.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-server.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-volume-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-volume-disabled.png
index 5eb09cfd..5eb09cfd 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-volume-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-volume-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-volume.png b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-volume.png
index b7392805..b7392805 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/remove-volume.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/remove-volume.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/reset-volume-option-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/reset-volume-option-disabled.png
index c4c955f5..c4c955f5 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/reset-volume-option-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/reset-volume-option-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/reset-volume-option.png b/src/org.gluster.storage.management.console/icons/tango/32x32/reset-volume-option.png
index 77203284..77203284 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/reset-volume-option.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/reset-volume-option.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/server.png b/src/org.gluster.storage.management.console/icons/tango/32x32/server.png
index e34eb4e4..e34eb4e4 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/server.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/server.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/servers.png b/src/org.gluster.storage.management.console/icons/tango/32x32/servers.png
index dca03af4..dca03af4 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/servers.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/servers.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/settings.png b/src/org.gluster.storage.management.console/icons/tango/32x32/settings.png
index 565f406d..565f406d 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/settings.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/settings.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/start-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/start-disabled.png
index 3f38a449..3f38a449 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/start-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/start-disabled.png
diff --git a/src/org.gluster.storage.management.console/icons/tango/32x32/start-offline-bricks-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/start-offline-bricks-disabled.png
new file mode 100644
index 00000000..9acbdfae
--- /dev/null
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/start-offline-bricks-disabled.png
diff --git a/src/org.gluster.storage.management.console/icons/tango/32x32/start-offline-bricks.png b/src/org.gluster.storage.management.console/icons/tango/32x32/start-offline-bricks.png
new file mode 100644
index 00000000..dbce3b9a
--- /dev/null
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/start-offline-bricks.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/start-volume-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/start-volume-disabled.png
index ad14408b..ad14408b 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/start-volume-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/start-volume-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/start-volume.png b/src/org.gluster.storage.management.console/icons/tango/32x32/start-volume.png
index d357d291..d357d291 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/start-volume.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/start-volume.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/start.png b/src/org.gluster.storage.management.console/icons/tango/32x32/start.png
index 578736ec..578736ec 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/start.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/start.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/stop-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/stop-disabled.png
index 3c778c3d..3c778c3d 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/stop-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/stop-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/stop-volume-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/stop-volume-disabled.png
index b70b2042..b70b2042 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/stop-volume-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/stop-volume-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/stop-volume.png b/src/org.gluster.storage.management.console/icons/tango/32x32/stop-volume.png
index 5cc5e1fb..5cc5e1fb 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/stop-volume.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/stop-volume.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/stop.png b/src/org.gluster.storage.management.console/icons/tango/32x32/stop.png
index 615e465b..615e465b 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/stop.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/stop.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/utilities-terminal.png b/src/org.gluster.storage.management.console/icons/tango/32x32/utilities-terminal.png
index f86c7840..f86c7840 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/utilities-terminal.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/utilities-terminal.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/view-refresh.png b/src/org.gluster.storage.management.console/icons/tango/32x32/view-refresh.png
index 606ea9eb..606ea9eb 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/view-refresh.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/view-refresh.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/volume-rebalance-disabled.png b/src/org.gluster.storage.management.console/icons/tango/32x32/volume-rebalance-disabled.png
index 35d49af7..35d49af7 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/volume-rebalance-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/volume-rebalance-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/volume-rebalance.png b/src/org.gluster.storage.management.console/icons/tango/32x32/volume-rebalance.png
index eb63ec20..eb63ec20 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/volume-rebalance.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/volume-rebalance.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/32x32/volume.png b/src/org.gluster.storage.management.console/icons/tango/32x32/volume.png
index 3e0d9add..3e0d9add 100644
--- a/src/com.gluster.storage.management.console/icons/tango/32x32/volume.png
+++ b/src/org.gluster.storage.management.console/icons/tango/32x32/volume.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/48x48/add-server.png b/src/org.gluster.storage.management.console/icons/tango/48x48/add-server.png
index 3e615b62..3e615b62 100644
--- a/src/com.gluster.storage.management.console/icons/tango/48x48/add-server.png
+++ b/src/org.gluster.storage.management.console/icons/tango/48x48/add-server.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/48x48/create-volume.png b/src/org.gluster.storage.management.console/icons/tango/48x48/create-volume.png
index 88a494cc..88a494cc 100644
--- a/src/com.gluster.storage.management.console/icons/tango/48x48/create-volume.png
+++ b/src/org.gluster.storage.management.console/icons/tango/48x48/create-volume.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/48x48/remove-brick-disabled.png b/src/org.gluster.storage.management.console/icons/tango/48x48/remove-brick-disabled.png
index 368b6696..368b6696 100644
--- a/src/com.gluster.storage.management.console/icons/tango/48x48/remove-brick-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/48x48/remove-brick-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/48x48/server.png b/src/org.gluster.storage.management.console/icons/tango/48x48/server.png
index a568c0b8..a568c0b8 100644
--- a/src/com.gluster.storage.management.console/icons/tango/48x48/server.png
+++ b/src/org.gluster.storage.management.console/icons/tango/48x48/server.png
diff --git a/src/org.gluster.storage.management.console/icons/tango/48x48/start-offline-bricks-disabled.png b/src/org.gluster.storage.management.console/icons/tango/48x48/start-offline-bricks-disabled.png
new file mode 100644
index 00000000..3e21d996
--- /dev/null
+++ b/src/org.gluster.storage.management.console/icons/tango/48x48/start-offline-bricks-disabled.png
diff --git a/src/org.gluster.storage.management.console/icons/tango/48x48/start-offline-bricks.png b/src/org.gluster.storage.management.console/icons/tango/48x48/start-offline-bricks.png
new file mode 100644
index 00000000..d4748fca
--- /dev/null
+++ b/src/org.gluster.storage.management.console/icons/tango/48x48/start-offline-bricks.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/48x48/start-volume-disabled.png b/src/org.gluster.storage.management.console/icons/tango/48x48/start-volume-disabled.png
index fcf25df4..fcf25df4 100644
--- a/src/com.gluster.storage.management.console/icons/tango/48x48/start-volume-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/48x48/start-volume-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/48x48/stop-volume-disabled.png b/src/org.gluster.storage.management.console/icons/tango/48x48/stop-volume-disabled.png
index f418875a..f418875a 100644
--- a/src/com.gluster.storage.management.console/icons/tango/48x48/stop-volume-disabled.png
+++ b/src/org.gluster.storage.management.console/icons/tango/48x48/stop-volume-disabled.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/8x8/offline.png b/src/org.gluster.storage.management.console/icons/tango/8x8/offline.png
index 6b33d298..6b33d298 100644
--- a/src/com.gluster.storage.management.console/icons/tango/8x8/offline.png
+++ b/src/org.gluster.storage.management.console/icons/tango/8x8/offline.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/8x8/online.png b/src/org.gluster.storage.management.console/icons/tango/8x8/online.png
index 58a61f1a..58a61f1a 100644
--- a/src/com.gluster.storage.management.console/icons/tango/8x8/online.png
+++ b/src/org.gluster.storage.management.console/icons/tango/8x8/online.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/8x8/star.png b/src/org.gluster.storage.management.console/icons/tango/8x8/star.png
index 5f8fc748..5f8fc748 100644
--- a/src/com.gluster.storage.management.console/icons/tango/8x8/star.png
+++ b/src/org.gluster.storage.management.console/icons/tango/8x8/star.png
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/add_brick.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/add_brick.svg
index b1fb427c..b1fb427c 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/add_brick.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/add_brick.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/add_volume.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/add_volume.svg
index 66307f36..66307f36 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/add_volume.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/add_volume.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/brick.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/brick.svg
index 365110f2..365110f2 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/brick.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/brick.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/brick_migration.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/brick_migration.svg
index 1fa4e0d4..1fa4e0d4 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/brick_migration.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/brick_migration.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/bricks.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/bricks.svg
index 39af40f2..39af40f2 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/bricks.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/bricks.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/cloud.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/cloud.svg
index d51128ac..d51128ac 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/cloud.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/cloud.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/create-volume-disabled.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/create-volume-disabled.svg
index 2cc8da4e..2cc8da4e 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/create-volume-disabled.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/create-volume-disabled.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/create-volume.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/create-volume.svg
index 14a5823f..14a5823f 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/create-volume.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/create-volume.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/disk (32-32).svg b/src/org.gluster.storage.management.console/icons/tango/scalable/disk (32-32).svg
index bfe35cce..bfe35cce 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/disk (32-32).svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/disk (32-32).svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/disk (48-48).svg b/src/org.gluster.storage.management.console/icons/tango/scalable/disk (48-48).svg
index 79f172df..79f172df 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/disk (48-48).svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/disk (48-48).svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/disk.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/disk.svg
index 730e9b27..730e9b27 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/disk.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/disk.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_available.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_available.svg
index 667535c1..667535c1 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_available.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_available.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_error.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_error.svg
index 1dda3bbf..1dda3bbf 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_error.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_error.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_initialisation.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_initialisation.svg
index 5bffaa8f..5bffaa8f 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_initialisation.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_initialisation.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_inuse.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_inuse.svg
index 5d5388b2..5d5388b2 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_inuse.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_inuse.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_uninitialised.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_uninitialised.svg
index f3cdd2ee..f3cdd2ee 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/disk_uninitialised.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/disk_uninitialised.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/download_log.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/download_log.svg
index 2ac27d12..2ac27d12 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/download_log.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/download_log.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/high_CPU_usage.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/high_CPU_usage.svg
index 1ed67ab8..1ed67ab8 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/high_CPU_usage.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/high_CPU_usage.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/high_memory_usage.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/high_memory_usage.svg
index 0ee3b389..0ee3b389 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/high_memory_usage.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/high_memory_usage.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/log.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/log.svg
index 42559766..42559766 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/log.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/log.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/low_diskspace.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/low_diskspace.svg
index dc5faa1b..dc5faa1b 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/low_diskspace.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/low_diskspace.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/offline-8x8.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/offline-8x8.svg
index fb587339..fb587339 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/offline-8x8.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/offline-8x8.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/offline.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/offline.svg
index 9ee10367..9ee10367 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/offline.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/offline.svg
diff --git a/src/org.gluster.storage.management.console/icons/tango/scalable/offline_brick.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/offline_brick.svg
new file mode 100644
index 00000000..bf1963df
--- /dev/null
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/offline_brick.svg
@@ -0,0 +1,4413 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48px"
+   height="48px"
+   id="svg3373"
+   version="1.1"
+   inkscape:version="0.47pre4 r22446"
+   sodipodi:docname="offline_brick.svg">
+  <defs
+     id="defs3375">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective855" />
+    <linearGradient
+       id="linearGradient11720">
+      <stop
+         style="stop-color:#397303;stop-opacity:1"
+         offset="0"
+         id="stop11722" />
+      <stop
+         style="stop-color:#3a7304;stop-opacity:1"
+         offset="1"
+         id="stop11724" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11703">
+      <stop
+         id="stop11705"
+         offset="0"
+         style="stop-color:#428504;stop-opacity:1" />
+      <stop
+         id="stop11707"
+         offset="1"
+         style="stop-color:#428504;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11691">
+      <stop
+         id="stop11693"
+         offset="0.0000000"
+         style="stop-color:#adff5e;stop-opacity:1" />
+      <stop
+         id="stop11695"
+         offset="1.0000000"
+         style="stop-color:#428504;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6230">
+      <stop
+         style="stop-color:#b4fb71;stop-opacity:1"
+         offset="0"
+         id="stop6232" />
+      <stop
+         style="stop-color:#3fa617;stop-opacity:1"
+         offset="1"
+         id="stop6234" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6214">
+      <stop
+         style="stop-color:#38a111;stop-opacity:1"
+         offset="0"
+         id="stop6216" />
+      <stop
+         style="stop-color:#baff76;stop-opacity:1"
+         offset="1"
+         id="stop6218" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6488-3">
+      <stop
+         id="stop6490-82"
+         offset="0"
+         style="stop-color:#38a111;stop-opacity:1;" />
+      <stop
+         id="stop6492-1"
+         offset="1"
+         style="stop-color:#baff76;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6359-4">
+      <stop
+         style="stop-color:#50980a;stop-opacity:1"
+         offset="0"
+         id="stop6361-5" />
+      <stop
+         style="stop-color:#a5f263;stop-opacity:1"
+         offset="1"
+         id="stop6363-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6367-09">
+      <stop
+         style="stop-color:#a5f263;stop-opacity:1"
+         offset="0"
+         id="stop6369-11" />
+      <stop
+         style="stop-color:#73d336;stop-opacity:1"
+         offset="1"
+         id="stop6371-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7721-5">
+      <stop
+         id="stop7723-5"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop7725-5"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6817-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0"
+         id="stop6819-3" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop6821-0" />
+    </linearGradient>
+    <linearGradient
+       y2="26.726358"
+       x2="-60.5989"
+       y1="85.233597"
+       x1="-61.105808"
+       gradientTransform="matrix(0.20634219,-2.8251295,-0.55401321,-0.04046413,292.054,-157.519)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7455"
+       xlink:href="#linearGradient6817-4"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4134-9">
+      <stop
+         id="stop4136-4"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop4148-8" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop4142-8" />
+      <stop
+         id="stop4138-2"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4206-4">
+      <stop
+         id="stop4208-5"
+         offset="0.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop4210-5"
+         offset="1.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3452">
+      <stop
+         id="stop3454"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop3456" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop3458" />
+      <stop
+         id="stop3460"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3463">
+      <stop
+         id="stop3465"
+         offset="0.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop3467"
+         offset="1.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7210">
+      <stop
+         id="stop7212"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop7214"
+         offset="1.0000000"
+         style="stop-color:#bfbebf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4539">
+      <stop
+         style="stop-color:#c71807;stop-opacity:1"
+         offset="0"
+         id="stop4541" />
+      <stop
+         style="stop-color:#ff6544;stop-opacity:1;"
+         offset="1"
+         id="stop4543" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4551">
+      <stop
+         id="stop4553"
+         offset="0"
+         style="stop-color:#f05134;stop-opacity:1" />
+      <stop
+         id="stop4555"
+         offset="1"
+         style="stop-color:#ca1c0a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4545">
+      <stop
+         id="stop4547"
+         offset="0"
+         style="stop-color:#f05034;stop-opacity:1" />
+      <stop
+         id="stop4549"
+         offset="1"
+         style="stop-color:#ca1c0a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7721">
+      <stop
+         id="stop7723"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop7725"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath7209">
+      <path
+         sodipodi:nodetypes="ccccccccccccc"
+         style="color:#000000;fill:#3a3a3a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00492704;marker:none;visibility:visible;display:block;overflow:visible"
+         d="m 55.991327,-9.5439311 0.384644,4.0541047 -4.410784,7.023608 1.238412,0.974332 0.02253,0.015935 c -1.131789,1.0529117 -2.602855,2.9928473 -3.667193,4.5026759 2.012445,1.1908153 4.067679,2.1356347 7.402896,2.5239083 0.463464,3.7503962 1.711167,6.4499082 2.697553,5.8955612 L 65.971804,17.247968 76.042629,13.937535 72.997753,-3.7702594 57.73133,-10.478992 z"
+         id="path7211"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <linearGradient
+       id="linearGradient5455-2">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0"
+         id="stop5457-4" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop5459-3" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4134-9-0">
+      <stop
+         id="stop4136-4-1"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop4148-8-6" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop4142-8-8" />
+      <stop
+         id="stop4138-2-9"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4206-4-5">
+      <stop
+         id="stop4208-5-7"
+         offset="0.0000000"
+         style="stop-color:#2b558c;stop-opacity:1" />
+      <stop
+         id="stop4210-5-6"
+         offset="1.0000000"
+         style="stop-color:#2c568c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7210-3">
+      <stop
+         id="stop7212-2"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop7214-3"
+         offset="1.0000000"
+         style="stop-color:#bfbebf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2316-0-5">
+      <stop
+         id="stop2318-7-1"
+         offset="0"
+         style="stop-color:#a48600;stop-opacity:1;" />
+      <stop
+         id="stop2320-5-1"
+         offset="1"
+         style="stop-color:#c4a000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2326-1-9">
+      <stop
+         id="stop2328-8-2"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2330-5-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6488-3-8">
+      <stop
+         id="stop6490-82-0"
+         offset="0"
+         style="stop-color:#38a111;stop-opacity:1;" />
+      <stop
+         id="stop6492-1-1"
+         offset="1"
+         style="stop-color:#baff76;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6359-4-7">
+      <stop
+         style="stop-color:#50980a;stop-opacity:1"
+         offset="0"
+         id="stop6361-5-4" />
+      <stop
+         style="stop-color:#a5f263;stop-opacity:1"
+         offset="1"
+         id="stop6363-4-6" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6367-09-0">
+      <stop
+         style="stop-color:#a5f263;stop-opacity:1"
+         offset="0"
+         id="stop6369-11-7" />
+      <stop
+         style="stop-color:#73d336;stop-opacity:1"
+         offset="1"
+         id="stop6371-8-4" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7721-5-2">
+      <stop
+         id="stop7723-5-1"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop7725-5-8"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6817-4-5">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0"
+         id="stop6819-3-7" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop6821-0-1" />
+    </linearGradient>
+    <linearGradient
+       y2="26.726358"
+       x2="-60.5989"
+       y1="85.233597"
+       x1="-61.105808"
+       gradientTransform="matrix(0.20634219,-2.8251295,-0.55401321,-0.04046413,292.054,-157.519)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7455-7"
+       xlink:href="#linearGradient6817-4-5"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4134-9-8">
+      <stop
+         id="stop4136-4-2"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop4148-8-3" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop4142-8-0" />
+      <stop
+         id="stop4138-2-2"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4206-4-8">
+      <stop
+         id="stop4208-5-8"
+         offset="0.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop4210-5-5"
+         offset="1.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3452-1">
+      <stop
+         id="stop3454-4"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop3456-1" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop3458-2" />
+      <stop
+         id="stop3460-6"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3463-3">
+      <stop
+         id="stop3465-3"
+         offset="0.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop3467-0"
+         offset="1.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7210-1">
+      <stop
+         id="stop7212-3"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop7214-8"
+         offset="1.0000000"
+         style="stop-color:#bfbebf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4539-9">
+      <stop
+         style="stop-color:#c71807;stop-opacity:1"
+         offset="0"
+         id="stop4541-8" />
+      <stop
+         style="stop-color:#ff6544;stop-opacity:1;"
+         offset="1"
+         id="stop4543-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4551-3">
+      <stop
+         id="stop4553-9"
+         offset="0"
+         style="stop-color:#f05134;stop-opacity:1" />
+      <stop
+         id="stop4555-3"
+         offset="1"
+         style="stop-color:#ca1c0a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4545-3">
+      <stop
+         id="stop4547-6"
+         offset="0"
+         style="stop-color:#f05034;stop-opacity:1" />
+      <stop
+         id="stop4549-5"
+         offset="1"
+         style="stop-color:#ca1c0a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7721-4">
+      <stop
+         id="stop7723-0"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop7725-50"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath7209-6">
+      <path
+         sodipodi:nodetypes="ccccccccccccc"
+         style="color:#000000;fill:#3a3a3a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00492704;marker:none;visibility:visible;display:block;overflow:visible"
+         d="m 55.991327,-9.5439311 0.384644,4.0541047 -4.410784,7.023608 1.238412,0.974332 0.02253,0.015935 c -1.131789,1.0529117 -2.602855,2.9928473 -3.667193,4.5026759 2.012445,1.1908153 4.067679,2.1356347 7.402896,2.5239083 0.463464,3.7503962 1.711167,6.4499082 2.697553,5.8955612 L 65.971804,17.247968 76.042629,13.937535 72.997753,-3.7702594 57.73133,-10.478992 z"
+         id="path7211-2"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <linearGradient
+       id="linearGradient5455-2-5">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0"
+         id="stop5457-4-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop5459-3-5" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4134-9-0-5">
+      <stop
+         id="stop4136-4-1-2"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop4148-8-6-0" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop4142-8-8-6" />
+      <stop
+         id="stop4138-2-9-7"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4206-4-5-8">
+      <stop
+         id="stop4208-5-7-0"
+         offset="0.0000000"
+         style="stop-color:#2b558c;stop-opacity:1" />
+      <stop
+         id="stop4210-5-6-0"
+         offset="1.0000000"
+         style="stop-color:#2c568c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7210-3-4">
+      <stop
+         id="stop7212-2-3"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop7214-3-7"
+         offset="1.0000000"
+         style="stop-color:#bfbebf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2316-0-5-1">
+      <stop
+         id="stop2318-7-1-8"
+         offset="0"
+         style="stop-color:#a48600;stop-opacity:1;" />
+      <stop
+         id="stop2320-5-1-5"
+         offset="1"
+         style="stop-color:#c4a000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2326-1-9-5">
+      <stop
+         id="stop2328-8-2-2"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2330-5-2-3"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6488-3-9">
+      <stop
+         id="stop6490-82-08"
+         offset="0"
+         style="stop-color:#38a111;stop-opacity:1;" />
+      <stop
+         id="stop6492-1-0"
+         offset="1"
+         style="stop-color:#baff76;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6359-4-5">
+      <stop
+         style="stop-color:#50980a;stop-opacity:1"
+         offset="0"
+         id="stop6361-5-1" />
+      <stop
+         style="stop-color:#a5f263;stop-opacity:1"
+         offset="1"
+         id="stop6363-4-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6367-09-9">
+      <stop
+         style="stop-color:#a5f263;stop-opacity:1"
+         offset="0"
+         id="stop6369-11-5" />
+      <stop
+         style="stop-color:#73d336;stop-opacity:1"
+         offset="1"
+         id="stop6371-8-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7721-5-6">
+      <stop
+         id="stop7723-5-2"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop7725-5-5"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6817-4-6">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0"
+         id="stop6819-3-3" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop6821-0-8" />
+    </linearGradient>
+    <linearGradient
+       y2="26.726358"
+       x2="-60.5989"
+       y1="85.233597"
+       x1="-61.105808"
+       gradientTransform="matrix(0.20634219,-2.8251295,-0.55401321,-0.04046413,292.054,-157.519)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7455-9"
+       xlink:href="#linearGradient6817-4-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4134-9-02">
+      <stop
+         id="stop4136-4-5"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop4148-8-1" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop4142-8-5" />
+      <stop
+         id="stop4138-2-7"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4206-4-4">
+      <stop
+         id="stop4208-5-1"
+         offset="0.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop4210-5-7"
+         offset="1.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3452-13">
+      <stop
+         id="stop3454-1"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop3456-5" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop3458-1" />
+      <stop
+         id="stop3460-5"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3463-5">
+      <stop
+         id="stop3465-1"
+         offset="0.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop3467-2"
+         offset="1.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7210-5">
+      <stop
+         id="stop7212-5"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop7214-38"
+         offset="1.0000000"
+         style="stop-color:#bfbebf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4539-8">
+      <stop
+         style="stop-color:#c71807;stop-opacity:1"
+         offset="0"
+         id="stop4541-4" />
+      <stop
+         style="stop-color:#ff6544;stop-opacity:1;"
+         offset="1"
+         id="stop4543-2" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4551-5">
+      <stop
+         id="stop4553-8"
+         offset="0"
+         style="stop-color:#f05134;stop-opacity:1" />
+      <stop
+         id="stop4555-4"
+         offset="1"
+         style="stop-color:#ca1c0a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4545-9">
+      <stop
+         id="stop4547-4"
+         offset="0"
+         style="stop-color:#f05034;stop-opacity:1" />
+      <stop
+         id="stop4549-4"
+         offset="1"
+         style="stop-color:#ca1c0a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7721-58">
+      <stop
+         id="stop7723-4"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop7725-1"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath7209-5">
+      <path
+         sodipodi:nodetypes="ccccccccccccc"
+         style="color:#000000;fill:#3a3a3a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00492704;marker:none;visibility:visible;display:block;overflow:visible"
+         d="m 55.991327,-9.5439311 0.384644,4.0541047 -4.410784,7.023608 1.238412,0.974332 0.02253,0.015935 c -1.131789,1.0529117 -2.602855,2.9928473 -3.667193,4.5026759 2.012445,1.1908153 4.067679,2.1356347 7.402896,2.5239083 0.463464,3.7503962 1.711167,6.4499082 2.697553,5.8955612 L 65.971804,17.247968 76.042629,13.937535 72.997753,-3.7702594 57.73133,-10.478992 z"
+         id="path7211-6"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <linearGradient
+       id="linearGradient5455-2-9">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0"
+         id="stop5457-4-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop5459-3-3" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4134-9-0-7">
+      <stop
+         id="stop4136-4-1-9"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop4148-8-6-04" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop4142-8-8-8" />
+      <stop
+         id="stop4138-2-9-74"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4206-4-5-2">
+      <stop
+         id="stop4208-5-7-3"
+         offset="0.0000000"
+         style="stop-color:#2b558c;stop-opacity:1" />
+      <stop
+         id="stop4210-5-6-5"
+         offset="1.0000000"
+         style="stop-color:#2c568c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7210-3-5">
+      <stop
+         id="stop7212-2-2"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop7214-3-9"
+         offset="1.0000000"
+         style="stop-color:#bfbebf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2316-0-5-8">
+      <stop
+         id="stop2318-7-1-7"
+         offset="0"
+         style="stop-color:#a48600;stop-opacity:1;" />
+      <stop
+         id="stop2320-5-1-8"
+         offset="1"
+         style="stop-color:#c4a000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2326-1-9-0">
+      <stop
+         id="stop2328-8-2-1"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2330-5-2-32"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6488-3-7"
+       id="linearGradient9924-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2591199,0.01934801,-0.01934801,1.2591199,342.13243,-20.226051)"
+       x1="-78.977859"
+       y1="31.32707"
+       x2="-48.390697"
+       y2="18.317263" />
+    <linearGradient
+       id="linearGradient6488-3-7">
+      <stop
+         id="stop6490-82-6"
+         offset="0"
+         style="stop-color:#38a111;stop-opacity:1;" />
+      <stop
+         id="stop6492-1-17"
+         offset="1"
+         style="stop-color:#baff76;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6359-4-0"
+       id="linearGradient9926-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2591199,0.01934801,-0.01934801,1.2591199,342.13243,-20.226051)"
+       x1="-78.034668"
+       y1="19.883467"
+       x2="-56.572613"
+       y2="25.997072" />
+    <linearGradient
+       id="linearGradient6359-4-0">
+      <stop
+         style="stop-color:#50980a;stop-opacity:1"
+         offset="0"
+         id="stop6361-5-6" />
+      <stop
+         style="stop-color:#a5f263;stop-opacity:1"
+         offset="1"
+         id="stop6363-4-02" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6367-09-6"
+       id="linearGradient9928-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2591199,0.01934801,-0.01934801,1.2591199,342.13243,-20.226051)"
+       x1="-66.404778"
+       y1="21.769932"
+       x2="-51.339279"
+       y2="26.261297" />
+    <linearGradient
+       id="linearGradient6367-09-6">
+      <stop
+         style="stop-color:#a5f263;stop-opacity:1"
+         offset="0"
+         id="stop6369-11-0" />
+      <stop
+         style="stop-color:#73d336;stop-opacity:1"
+         offset="1"
+         id="stop6371-8-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7721-5-0"
+       id="linearGradient9930-2"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2623645,0.01939786,-0.01991094,1.2957544,342.35808,-20.945388)"
+       x1="-80.638779"
+       y1="22.180561"
+       x2="-45.592064"
+       y2="65.951057" />
+    <linearGradient
+       id="linearGradient7721-5-0">
+      <stop
+         id="stop7723-5-9"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop7725-5-54"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6817-4-56"
+       id="linearGradient9932-32"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.672406,0.05643127,-0.00707387,0.46034998,484.35486,0.66073804)"
+       x1="-60.176182"
+       y1="48.328663"
+       x2="-60.225922"
+       y2="23.254047" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6817-4-56">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0"
+         id="stop6819-3-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop6821-0-88" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6817-4-56"
+       id="linearGradient9934-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.2159587,-2.5583937,0.50170579,-0.23845183,183.14808,-136.98861)"
+       x1="-60.43829"
+       y1="49.03693"
+       x2="-60.549427"
+       y2="26.612957" />
+    <linearGradient
+       y2="26.726358"
+       x2="-60.5989"
+       y1="85.233597"
+       x1="-61.105808"
+       gradientTransform="matrix(0.20634219,-2.8251295,-0.55401321,-0.04046413,292.054,-157.519)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7455-5"
+       xlink:href="#linearGradient6817-4-56"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient4134-9-5">
+      <stop
+         id="stop4136-4-7"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop4148-8-9" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop4142-8-2" />
+      <stop
+         id="stop4138-2-3"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4206-4-7">
+      <stop
+         id="stop4208-5-9"
+         offset="0.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop4210-5-3"
+         offset="1.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4176-3"
+       inkscape:collect="always">
+      <stop
+         id="stop4178-8"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4180-1"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient6924-6"
+       inkscape:collect="always">
+      <stop
+         id="stop6926-8"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop6928-76"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3452-3">
+      <stop
+         id="stop3454-8"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop3456-50" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop3458-9" />
+      <stop
+         id="stop3460-2"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3463-33">
+      <stop
+         id="stop3465-5"
+         offset="0.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop3467-29"
+         offset="1.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7210-7">
+      <stop
+         id="stop7212-33"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop7214-0"
+         offset="1.0000000"
+         style="stop-color:#bfbebf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4539-3">
+      <stop
+         style="stop-color:#c71807;stop-opacity:1"
+         offset="0"
+         id="stop4541-2" />
+      <stop
+         style="stop-color:#ff6544;stop-opacity:1;"
+         offset="1"
+         id="stop4543-1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4551-8">
+      <stop
+         id="stop4553-1"
+         offset="0"
+         style="stop-color:#f05134;stop-opacity:1" />
+      <stop
+         id="stop4555-8"
+         offset="1"
+         style="stop-color:#ca1c0a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4545-2">
+      <stop
+         id="stop4547-8"
+         offset="0"
+         style="stop-color:#f05034;stop-opacity:1" />
+      <stop
+         id="stop4549-9"
+         offset="1"
+         style="stop-color:#ca1c0a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7721-3">
+      <stop
+         id="stop7723-02"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop7725-8"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath7209-8">
+      <path
+         sodipodi:nodetypes="ccccccccccccc"
+         style="color:#000000;fill:#3a3a3a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00492704;marker:none;visibility:visible;display:block;overflow:visible"
+         d="m 55.991327,-9.5439311 0.384644,4.0541047 -4.410784,7.023608 1.238412,0.974332 0.02253,0.015935 c -1.131789,1.0529117 -2.602855,2.9928473 -3.667193,4.5026759 2.012445,1.1908153 4.067679,2.1356347 7.402896,2.5239083 0.463464,3.7503962 1.711167,6.4499082 2.697553,5.8955612 L 65.971804,17.247968 76.042629,13.937535 72.997753,-3.7702594 57.73133,-10.478992 z"
+         id="path7211-27"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <linearGradient
+       id="linearGradient5455-2-7">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0"
+         id="stop5457-4-9" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop5459-3-50" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4134-9-0-4">
+      <stop
+         id="stop4136-4-1-0"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop4148-8-6-1" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop4142-8-8-5" />
+      <stop
+         id="stop4138-2-9-3"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4206-4-5-23">
+      <stop
+         id="stop4208-5-7-2"
+         offset="0.0000000"
+         style="stop-color:#2b558c;stop-opacity:1" />
+      <stop
+         id="stop4210-5-6-9"
+         offset="1.0000000"
+         style="stop-color:#2c568c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7210-3-44">
+      <stop
+         id="stop7212-2-9"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop7214-3-8"
+         offset="1.0000000"
+         style="stop-color:#bfbebf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2316-0-5-2">
+      <stop
+         id="stop2318-7-1-9"
+         offset="0"
+         style="stop-color:#a48600;stop-opacity:1;" />
+      <stop
+         id="stop2320-5-1-3"
+         offset="1"
+         style="stop-color:#c4a000;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2326-1-9-02">
+      <stop
+         id="stop2328-8-2-0"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2330-5-2-1"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="26.726358"
+       x2="-60.5989"
+       y1="85.233597"
+       x1="-61.105808"
+       gradientTransform="matrix(0.20634219,-2.8251295,-0.55401321,-0.04046413,292.054,-157.519)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3612-21"
+       xlink:href="#linearGradient6817-4-56"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4134-9-5"
+       id="linearGradient5410"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.88340971,0,0,0.88340971,41.850823,-2.8039326)"
+       x1="9.9747334"
+       y1="31.09375"
+       x2="37.077564"
+       y2="31.09375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4206-4-7"
+       id="linearGradient5412"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.88340971,0,0,0.88340971,41.850823,-2.8039326)"
+       x1="25.064732"
+       y1="21.857143"
+       x2="25.207588"
+       y2="25.428572" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4176-3"
+       id="linearGradient5414"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.88340971,0,0,0.88340971,41.850823,-2.8039326)"
+       x1="17.160095"
+       y1="14.004482"
+       x2="37.969398"
+       y2="56.575912" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6924-6"
+       id="linearGradient5418"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.88340971,0,0,0.88340971,41.724623,-0.46920261)"
+       x1="16.07143"
+       y1="19.5"
+       x2="15.785715"
+       y2="30" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6214"
+       id="linearGradient6220"
+       x1="28.158247"
+       y1="13.121862"
+       x2="21.283247"
+       y2="4.670352"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6230"
+       id="linearGradient6236"
+       x1="19.120131"
+       y1="20.965828"
+       x2="28.07798"
+       y2="14.630604"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6296297,-48,-11.353009)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6488-3-7"
+       id="linearGradient6258"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0296406,0.01582176,-0.01582176,1.0296406,53.400982,-41.023689)"
+       x1="-78.977859"
+       y1="31.32707"
+       x2="-48.390697"
+       y2="18.317263" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6488-3-7-9"
+       id="linearGradient6258-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0296406,0.01582176,-0.01582176,1.0296406,53.400982,-41.023689)"
+       x1="-78.977859"
+       y1="31.32707"
+       x2="-48.390697"
+       y2="18.317263" />
+    <linearGradient
+       id="linearGradient6488-3-7-9">
+      <stop
+         id="stop6490-82-6-6"
+         offset="0"
+         style="stop-color:#38a111;stop-opacity:1;" />
+      <stop
+         id="stop6492-1-17-3"
+         offset="1"
+         style="stop-color:#baff76;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6214"
+       id="linearGradient6300"
+       gradientUnits="userSpaceOnUse"
+       x1="24.595747"
+       y1="14.996862"
+       x2="24.595747"
+       y2="4.670352"
+       gradientTransform="translate(79.25,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6230"
+       id="linearGradient6302"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-127.25,0)"
+       x1="22.807631"
+       y1="14.75276"
+       x2="22.82798"
+       y2="17.890547" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6214"
+       id="linearGradient6323"
+       gradientUnits="userSpaceOnUse"
+       x1="28.158247"
+       y1="13.121862"
+       x2="21.283247"
+       y2="4.670352" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6230"
+       id="linearGradient6325"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6296297,-48,-11.353009)"
+       x1="19.120131"
+       y1="20.965828"
+       x2="28.07798"
+       y2="14.630604" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6214"
+       id="linearGradient6337"
+       gradientUnits="userSpaceOnUse"
+       x1="28.158247"
+       y1="13.121862"
+       x2="21.283247"
+       y2="4.670352" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6230"
+       id="linearGradient6339"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6296297,-48,-11.353009)"
+       x1="19.120131"
+       y1="20.965828"
+       x2="28.07798"
+       y2="14.630604" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6214"
+       id="linearGradient6364"
+       gradientUnits="userSpaceOnUse"
+       x1="28.158247"
+       y1="13.121862"
+       x2="21.283247"
+       y2="4.670352" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6230"
+       id="linearGradient6366"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6296297,-48,-11.353009)"
+       x1="19.120131"
+       y1="20.965828"
+       x2="28.07798"
+       y2="14.630604" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6214"
+       id="linearGradient6368"
+       gradientUnits="userSpaceOnUse"
+       x1="28.158247"
+       y1="13.121862"
+       x2="21.283247"
+       y2="4.670352" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6230"
+       id="linearGradient6370"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6296297,-48,-11.353009)"
+       x1="19.120131"
+       y1="20.965828"
+       x2="28.07798"
+       y2="14.630604" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6214"
+       id="linearGradient6372"
+       gradientUnits="userSpaceOnUse"
+       x1="28.158247"
+       y1="13.121862"
+       x2="21.283247"
+       y2="4.670352" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6230"
+       id="linearGradient6374"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6296297,-48,-11.353009)"
+       x1="19.120131"
+       y1="20.965828"
+       x2="28.07798"
+       y2="14.630604" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6214"
+       id="linearGradient6391"
+       gradientUnits="userSpaceOnUse"
+       x1="28.158247"
+       y1="13.121862"
+       x2="21.283247"
+       y2="4.670352" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6230"
+       id="linearGradient6393"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,1.6296297,-48,-11.353009)"
+       x1="19.120131"
+       y1="20.965828"
+       x2="28.07798"
+       y2="14.630604" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath6566">
+      <path
+         sodipodi:nodetypes="sssssss"
+         inkscape:connector-curvature="0"
+         id="path6568"
+         d="m 437.13691,15.625187 c 0,3.922069 -8.57373,7.101535 -19.14997,7.101535 -10.57623,0 -19.14997,-3.179466 -19.14997,-7.101535 0,-2.453312 -2.97639,-9.339638 2.1246,-10.615427 3.05388,-0.763794 13.06472,-4.48610801 17.02537,-4.48610801 4.65593,0 15.23964,3.20196201 18.55878,4.22641201 4.22049,1.302653 0.59119,8.679649 0.59119,10.875123 z"
+         style="color:#000000;fill:#3a3a3a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00492704;marker:none;visibility:visible;display:block;overflow:visible"
+         clip-path="none" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4134-9-5"
+       id="linearGradient6639"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)"
+       x1="9.9747334"
+       y1="31.09375"
+       x2="37.077564"
+       y2="31.09375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4206-4-7"
+       id="linearGradient6641"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)"
+       x1="25.064732"
+       y1="21.857143"
+       x2="25.207588"
+       y2="25.428572" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4176-3"
+       id="linearGradient6643"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4954152,0,0,1.4954152,382.15258,-12.162834)"
+       x1="17.160095"
+       y1="14.004482"
+       x2="37.969398"
+       y2="56.575912" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7210-7"
+       id="linearGradient6645"
+       gradientUnits="userSpaceOnUse"
+       x1="24"
+       y1="16.525082"
+       x2="24"
+       y2="13.284962" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6924-6"
+       id="linearGradient6647"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4954152,0,0,1.4954152,381.93895,-8.2106577)"
+       x1="16.07143"
+       y1="19.5"
+       x2="15.785715"
+       y2="30" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6214"
+       id="linearGradient6649"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(394,0)"
+       x1="28.158247"
+       y1="13.121862"
+       x2="21.283247"
+       y2="4.670352" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6230"
+       id="linearGradient6651"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,3.0700325,-442,-31.270668)"
+       x1="19.120131"
+       y1="20.965828"
+       x2="28.07798"
+       y2="14.630604" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6214"
+       id="linearGradient6653"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(394,0)"
+       x1="28.158247"
+       y1="13.121862"
+       x2="21.283247"
+       y2="4.670352" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6230"
+       id="linearGradient6655"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,3.0700325,-442,-31.270668)"
+       x1="19.120131"
+       y1="20.965828"
+       x2="28.07798"
+       y2="14.630604" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6214"
+       id="linearGradient6657"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(394,0)"
+       x1="28.158247"
+       y1="13.121862"
+       x2="21.283247"
+       y2="4.670352" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6230"
+       id="linearGradient6659"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,3.0700325,-442,-31.270668)"
+       x1="19.120131"
+       y1="20.965828"
+       x2="28.07798"
+       y2="14.630604" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4134-9-4"
+       id="linearGradient7322-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.88340971,0,0,0.88340971,41.850823,-2.8039326)"
+       x1="9.9747334"
+       y1="31.09375"
+       x2="37.077564"
+       y2="31.09375" />
+    <linearGradient
+       id="linearGradient4134-9-4">
+      <stop
+         id="stop4136-4-75"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop4148-8-0" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop4142-8-3" />
+      <stop
+         id="stop4138-2-20"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4206-4-88"
+       id="linearGradient7324-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.88340971,0,0,0.88340971,41.850823,-2.8039326)"
+       x1="25.064732"
+       y1="21.857143"
+       x2="25.207588"
+       y2="25.428572" />
+    <linearGradient
+       id="linearGradient4206-4-88">
+      <stop
+         id="stop4208-5-5"
+         offset="0.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop4210-5-9"
+         offset="1.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4176-0"
+       id="linearGradient7326-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.88340971,0,0,0.88340971,41.850823,-2.8039326)"
+       x1="17.160095"
+       y1="14.004482"
+       x2="37.969398"
+       y2="56.575912" />
+    <linearGradient
+       id="linearGradient4176-0"
+       inkscape:collect="always">
+      <stop
+         id="stop4178-3"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4180-7"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7210-9"
+       id="linearGradient7328-7"
+       gradientUnits="userSpaceOnUse"
+       x1="24"
+       y1="16.525082"
+       x2="24"
+       y2="13.284962" />
+    <linearGradient
+       id="linearGradient7210-9">
+      <stop
+         id="stop7212-59"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop7214-06"
+         offset="1.0000000"
+         style="stop-color:#bfbebf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6924-7"
+       id="linearGradient7330-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.88340971,0,0,0.88340971,41.724623,-0.46920261)"
+       x1="16.07143"
+       y1="19.5"
+       x2="15.785715"
+       y2="30" />
+    <linearGradient
+       id="linearGradient6924-7"
+       inkscape:collect="always">
+      <stop
+         id="stop6926-69"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop6928-0"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4539-1"
+       id="linearGradient7332-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0195811,0.01566719,-0.01566719,1.0195811,137.8252,6.1634)"
+       x1="-79.963799"
+       y1="31.954889"
+       x2="-52.985451"
+       y2="21.220755" />
+    <linearGradient
+       id="linearGradient4539-1">
+      <stop
+         style="stop-color:#c71807;stop-opacity:1"
+         offset="0"
+         id="stop4541-7" />
+      <stop
+         style="stop-color:#ff6544;stop-opacity:1;"
+         offset="1"
+         id="stop4543-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4551-59"
+       id="linearGradient7334-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0195811,0.01566719,-0.01566719,1.0195811,137.8252,6.1634)"
+       x1="-60.971153"
+       y1="26.995193"
+       x2="-63.190922"
+       y2="18.49259" />
+    <linearGradient
+       id="linearGradient4551-59">
+      <stop
+         id="stop4553-0"
+         offset="0"
+         style="stop-color:#f05134;stop-opacity:1" />
+      <stop
+         id="stop4555-40"
+         offset="1"
+         style="stop-color:#ca1c0a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4545-25"
+       id="linearGradient7336-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0195811,0.01566719,-0.01566719,1.0195811,137.8252,6.1634)"
+       x1="-60.379169"
+       y1="23.812271"
+       x2="-51.339279"
+       y2="26.261297" />
+    <linearGradient
+       id="linearGradient4545-25">
+      <stop
+         id="stop4547-80"
+         offset="0"
+         style="stop-color:#f05034;stop-opacity:1" />
+      <stop
+         id="stop4549-7"
+         offset="1"
+         style="stop-color:#ca1c0a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7721-9"
+       id="linearGradient7338-4"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0222085,0.01570755,-0.01612302,1.0492462,138.00792,5.5809119)"
+       x1="-80.638779"
+       y1="22.180561"
+       x2="-45.592064"
+       y2="65.951057" />
+    <linearGradient
+       id="linearGradient7721-9">
+      <stop
+         id="stop7723-3"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop7725-4"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6817-1"
+       id="linearGradient7340-01"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.9737564,0.04569561,-0.00572812,0.37277161,252.99081,23.076623)"
+       x1="-60.273727"
+       y1="52.962711"
+       x2="-60.231167"
+       y2="20.531628" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6817-1">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0"
+         id="stop6819-4" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop6821-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6817-1"
+       id="linearGradient7342-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.98463104,-2.0716772,0.40625977,-0.19308803,9.0865162,-88.385897)"
+       x1="-60.43829"
+       y1="49.03693"
+       x2="-60.549427"
+       y2="26.612957" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6817-1"
+       id="linearGradient7344-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.16708703,-2.2876683,-0.44861606,-0.03276611,97.273845,-105.01052)"
+       x1="-61.105808"
+       y1="85.233597"
+       x2="-60.5989"
+       y2="26.726358" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath7209-64">
+      <path
+         sodipodi:nodetypes="ccccccccccccc"
+         style="color:#000000;fill:#3a3a3a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00492704;marker:none;visibility:visible;display:block;overflow:visible"
+         d="m 55.991327,-9.5439311 0.384644,4.0541047 -4.410784,7.023608 1.238412,0.974332 0.02253,0.015935 c -1.131789,1.0529117 -2.602855,2.9928473 -3.667193,4.5026759 2.012445,1.1908153 4.067679,2.1356347 7.402896,2.5239083 0.463464,3.7503962 1.711167,6.4499082 2.697553,5.8955612 L 65.971804,17.247968 76.042629,13.937535 72.997753,-3.7702594 57.73133,-10.478992 z"
+         id="path7211-3"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5455-2-0"
+       id="linearGradient7346-8"
+       gradientUnits="userSpaceOnUse"
+       x1="54.71489"
+       y1="5.4645443"
+       x2="72.233635"
+       y2="5.4645443" />
+    <linearGradient
+       id="linearGradient5455-2-0">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0"
+         id="stop5457-4-1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop5459-3-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4134-9-5"
+       id="linearGradient6925"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)"
+       x1="9.9747334"
+       y1="31.09375"
+       x2="37.077564"
+       y2="31.09375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4206-4-7"
+       id="linearGradient6927"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)"
+       x1="25.064732"
+       y1="21.857143"
+       x2="25.207588"
+       y2="25.428572" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4176-3"
+       id="linearGradient6929"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4954152,0,0,1.4954152,382.15258,-12.162834)"
+       x1="17.160095"
+       y1="14.004482"
+       x2="37.969398"
+       y2="56.575912" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7210-7"
+       id="linearGradient6931"
+       gradientUnits="userSpaceOnUse"
+       x1="24"
+       y1="16.525082"
+       x2="24"
+       y2="13.284962" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6924-6"
+       id="linearGradient6933"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4954152,0,0,1.4954152,381.93895,-8.2106577)"
+       x1="16.07143"
+       y1="19.5"
+       x2="15.785715"
+       y2="30" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4134-9-5-0"
+       id="linearGradient6925-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)"
+       x1="9.9747334"
+       y1="31.09375"
+       x2="37.077564"
+       y2="31.09375" />
+    <linearGradient
+       id="linearGradient4134-9-5-0">
+      <stop
+         id="stop4136-4-7-3"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop4148-8-9-1" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop4142-8-2-0" />
+      <stop
+         id="stop4138-2-3-9"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4206-4-7-2"
+       id="linearGradient6927-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4954152,0,0,1.4906315,382.15258,-11.973727)"
+       x1="25.064732"
+       y1="21.857143"
+       x2="25.207588"
+       y2="25.428572" />
+    <linearGradient
+       id="linearGradient4206-4-7-2">
+      <stop
+         id="stop4208-5-9-5"
+         offset="0.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop4210-5-3-5"
+         offset="1.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4176-3-6"
+       id="linearGradient6929-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4954152,0,0,1.4954152,382.15258,-12.162834)"
+       x1="17.160095"
+       y1="14.004482"
+       x2="37.969398"
+       y2="56.575912" />
+    <linearGradient
+       id="linearGradient4176-3-6"
+       inkscape:collect="always">
+      <stop
+         id="stop4178-8-4"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4180-1-5"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7210-7-1"
+       id="linearGradient6931-7"
+       gradientUnits="userSpaceOnUse"
+       x1="24"
+       y1="16.525082"
+       x2="24"
+       y2="13.284962" />
+    <linearGradient
+       id="linearGradient7210-7-1">
+      <stop
+         id="stop7212-33-7"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop7214-0-3"
+         offset="1.0000000"
+         style="stop-color:#bfbebf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="30"
+       x2="15.785715"
+       y1="19.5"
+       x1="16.07143"
+       gradientTransform="matrix(1.4954152,0,0,1.4954152,381.93895,-8.2106577)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient31475"
+       xlink:href="#linearGradient6924-6-7"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient6924-6-7"
+       inkscape:collect="always">
+      <stop
+         id="stop6926-8-3"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop6928-76-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="30"
+       x2="15.785715"
+       y1="19.5"
+       x1="16.07143"
+       gradientTransform="matrix(1.4954152,0,0,1.4954152,381.93895,-8.2106577)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5597"
+       xlink:href="#linearGradient6924-6-7"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4134-9-5-6"
+       id="linearGradient9470"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0768062,20.160914,4.7996577)"
+       x1="9.9747334"
+       y1="31.09375"
+       x2="37.077564"
+       y2="31.09375" />
+    <linearGradient
+       id="linearGradient4134-9-5-6">
+      <stop
+         id="stop4136-4-7-1"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop4148-8-9-9" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop4142-8-2-02" />
+      <stop
+         id="stop4138-2-3-6"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4206-4-7-8"
+       id="linearGradient9472"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0768062,20.160914,4.7996577)"
+       x1="25.064732"
+       y1="21.857143"
+       x2="25.207588"
+       y2="25.428572" />
+    <linearGradient
+       id="linearGradient4206-4-7-8">
+      <stop
+         id="stop4208-5-9-9"
+         offset="0.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop4210-5-3-6"
+         offset="1.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4176-3-2"
+       id="linearGradient9474"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.160914,4.6630501)"
+       x1="17.160095"
+       y1="14.004482"
+       x2="37.969398"
+       y2="56.575912" />
+    <linearGradient
+       id="linearGradient4176-3-2"
+       inkscape:collect="always">
+      <stop
+         id="stop4178-8-5"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4180-1-8"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7210-7-1-8"
+       id="linearGradient9476"
+       gradientUnits="userSpaceOnUse"
+       x1="24"
+       y1="16.525082"
+       x2="24"
+       y2="13.284962" />
+    <linearGradient
+       id="linearGradient7210-7-1-8">
+      <stop
+         id="stop7212-33-6"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop7214-0-6"
+         offset="1.0000000"
+         style="stop-color:#bfbebf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6924-6-1"
+       id="linearGradient9478"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.006284,7.5180332)"
+       x1="16.07143"
+       y1="19.5"
+       x2="15.785715"
+       y2="30" />
+    <linearGradient
+       id="linearGradient6924-6-1"
+       inkscape:collect="always">
+      <stop
+         id="stop6926-8-6"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop6928-76-7"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="30"
+       x2="15.785715"
+       y1="19.5"
+       x1="16.07143"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.006284,7.5180332)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9517"
+       xlink:href="#linearGradient6924-6-1"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient9647">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop9649" />
+      <stop
+         style="stop-color:#dbdbdb;stop-opacity:1;"
+         offset="1"
+         id="stop9651" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2256">
+      <stop
+         style="stop-color:#ff0202;stop-opacity:1;"
+         offset="0"
+         id="stop2258" />
+      <stop
+         style="stop-color:#ff9b9b;stop-opacity:1;"
+         offset="1"
+         id="stop2260" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2248">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2250" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2252" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient11780">
+      <stop
+         style="stop-color:#ff8b8b;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop11782" />
+      <stop
+         style="stop-color:#ec1b1b;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop11784" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4981">
+      <stop
+         style="stop-color:#cc0000;stop-opacity:1;"
+         offset="0"
+         id="stop4983" />
+      <stop
+         style="stop-color:#b30000;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop4985" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient21644"
+       id="radialGradient21650"
+       cx="25.125"
+       cy="36.75"
+       fx="25.125"
+       fy="36.75"
+       r="15.75"
+       gradientTransform="matrix(1,0,0,0.595238,0,14.875)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient21644">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop21646" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop21648" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3957">
+      <stop
+         style="stop-color:#fffeff;stop-opacity:0.33333334;"
+         offset="0"
+         id="stop3959" />
+      <stop
+         style="stop-color:#fffeff;stop-opacity:0.21568628;"
+         offset="1"
+         id="stop3961" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11691"
+       id="linearGradient11663"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91724819,0,0,0.91907213,302.29549,5.732139)"
+       x1="15.737001"
+       y1="12.5036"
+       x2="53.570126"
+       y2="47.374317" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2248"
+       id="radialGradient11665"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.838984,0,0,2.961346,253.30758,-14.714265)"
+       cx="16.75"
+       cy="10.666344"
+       fx="16.75"
+       fy="10.666344"
+       r="21.25" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11720"
+       id="linearGradient11718"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.87782436,0.99037957,-0.87782433,0.99037953,319.93281,-20.25021)"
+       x1="21.75"
+       y1="15.80225"
+       x2="24.30225"
+       y2="35.05225" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11691"
+       id="linearGradient22637"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91724819,0,0,0.91907213,302.29549,5.732139)"
+       x1="15.737001"
+       y1="12.5036"
+       x2="53.570126"
+       y2="47.374317" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2248"
+       id="radialGradient22639"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(3.838984,0,0,2.961346,253.30758,-14.714265)"
+       cx="16.75"
+       cy="10.666344"
+       fx="16.75"
+       fy="10.666344"
+       r="21.25" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11720"
+       id="linearGradient22641"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.87782436,0.99037957,-0.87782433,0.99037953,319.93281,-20.25021)"
+       x1="21.75"
+       y1="15.80225"
+       x2="24.30225"
+       y2="35.05225" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2684-1"
+       id="linearGradient8265"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.128181,0,0,1.128181,-108.08145,-78.763896)"
+       x1="70.913956"
+       y1="101.74152"
+       x2="70.951942"
+       y2="88.923729" />
+    <linearGradient
+       id="linearGradient2684-1">
+      <stop
+         id="stop2686-7"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2688-4"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9056"
+       id="radialGradient8267"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.05324342,-0.836238,2.019473,0.128568,-206.0078,112.67299)"
+       cx="107.5884"
+       cy="83.990814"
+       fx="107.5884"
+       fy="83.990814"
+       r="12.551644" />
+    <linearGradient
+       id="linearGradient9056">
+      <stop
+         style="stop-color:#6acd11;stop-opacity:1"
+         offset="0"
+         id="stop9058" />
+      <stop
+         style="stop-color:#4cbe01;stop-opacity:1"
+         offset="1"
+         id="stop9060" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9050"
+       id="linearGradient8269"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-99.088729,-66.498056)"
+       x1="71.288956"
+       y1="124.11652"
+       x2="70.826942"
+       y2="95" />
+    <linearGradient
+       id="linearGradient9050">
+      <stop
+         id="stop9052"
+         offset="0"
+         style="stop-color:#428405;stop-opacity:1" />
+      <stop
+         id="stop9054"
+         offset="1"
+         style="stop-color:#264a03;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4134-9-5-6"
+       id="linearGradient17969"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0768062,20.160914,4.7996577)"
+       x1="9.9747334"
+       y1="31.09375"
+       x2="37.077564"
+       y2="31.09375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4206-4-7-8"
+       id="linearGradient17971"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0768062,20.160914,4.7996577)"
+       x1="25.064732"
+       y1="21.857143"
+       x2="25.207588"
+       y2="25.428572" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4176-3-2"
+       id="linearGradient17973"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.160914,4.6630501)"
+       x1="17.160095"
+       y1="14.004482"
+       x2="37.969398"
+       y2="56.575912" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7210-7-1-8"
+       id="linearGradient17975"
+       gradientUnits="userSpaceOnUse"
+       x1="24"
+       y1="16.525082"
+       x2="24"
+       y2="13.284962" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6924-6-1"
+       id="linearGradient17977"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.006284,7.5180332)"
+       x1="16.07143"
+       y1="19.5"
+       x2="15.785715"
+       y2="30" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4134-9-5-6"
+       id="linearGradient17986"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0768062,20.160914,4.7996577)"
+       x1="9.9747334"
+       y1="31.09375"
+       x2="37.077564"
+       y2="31.09375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4206-4-7-8"
+       id="linearGradient17988"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0768062,20.160914,4.7996577)"
+       x1="25.064732"
+       y1="21.857143"
+       x2="25.207588"
+       y2="25.428572" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4176-3-2"
+       id="linearGradient17990"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.160914,4.6630501)"
+       x1="17.160095"
+       y1="14.004482"
+       x2="37.969398"
+       y2="56.575912" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7210-7-1-8"
+       id="linearGradient17992"
+       gradientUnits="userSpaceOnUse"
+       x1="24"
+       y1="16.525082"
+       x2="24"
+       y2="13.284962" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6924-6-1"
+       id="linearGradient17994"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.006284,7.5180332)"
+       x1="16.07143"
+       y1="19.5"
+       x2="15.785715"
+       y2="30" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4134-9-6-2"
+       id="linearGradient10212"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.47256308,0,0,0.47256308,32.329484,6.9416806)"
+       x1="9.9747334"
+       y1="31.09375"
+       x2="37.077564"
+       y2="31.09375" />
+    <linearGradient
+       id="linearGradient4134-9-6-2">
+      <stop
+         id="stop4136-4-9-1"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop4148-8-6-9" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop4142-8-9-7" />
+      <stop
+         id="stop4138-2-8-2"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4206-4-8-2"
+       id="linearGradient10214"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.47256308,0,0,0.47256308,32.329484,6.9416806)"
+       x1="25.064732"
+       y1="21.857143"
+       x2="25.207588"
+       y2="25.428572" />
+    <linearGradient
+       id="linearGradient4206-4-8-2">
+      <stop
+         id="stop4208-5-3-8"
+         offset="0.0000000"
+         style="stop-color:#2b558c;stop-opacity:1" />
+      <stop
+         id="stop4210-5-8-2"
+         offset="1.0000000"
+         style="stop-color:#2c568c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4176-9-0"
+       id="linearGradient10216"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.45408812,0,0,0.45408812,32.774075,7.2711045)"
+       x1="17.160095"
+       y1="14.004482"
+       x2="37.969398"
+       y2="56.575912" />
+    <linearGradient
+       id="linearGradient4176-9-0"
+       inkscape:collect="always">
+      <stop
+         id="stop4178-6-7"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4180-7-9"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7210-8-1"
+       id="linearGradient10218"
+       gradientUnits="userSpaceOnUse"
+       x1="24"
+       y1="16.525082"
+       x2="24"
+       y2="-5.456851" />
+    <linearGradient
+       id="linearGradient7210-8-1">
+      <stop
+         id="stop7212-7-8"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop7214-5-6"
+         offset="1.0000000"
+         style="stop-color:#bfbebf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6924-1-0"
+       id="linearGradient10220"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.47256308,0,0,0.47256308,32.448286,7.8656215)"
+       x1="15.972866"
+       y1="16.641634"
+       x2="15.785715"
+       y2="30" />
+    <linearGradient
+       id="linearGradient6924-1-0"
+       inkscape:collect="always">
+      <stop
+         id="stop6926-3-7"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop6928-9-8"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4134-9-6-2"
+       id="linearGradient13412"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.47256308,0,0,0.47256308,-19.884513,6.8263032)"
+       x1="9.9747334"
+       y1="31.09375"
+       x2="37.077564"
+       y2="31.09375" />
+    <linearGradient
+       id="linearGradient9325">
+      <stop
+         id="stop9327"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop9329" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop9331" />
+      <stop
+         id="stop9333"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4206-4-8-2"
+       id="linearGradient13414"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.47256308,0,0,0.47256308,-19.884513,6.8263032)"
+       x1="25.064732"
+       y1="21.857143"
+       x2="25.207588"
+       y2="25.428572" />
+    <linearGradient
+       id="linearGradient9336">
+      <stop
+         id="stop9338"
+         offset="0.0000000"
+         style="stop-color:#2b558c;stop-opacity:1" />
+      <stop
+         id="stop9340"
+         offset="1.0000000"
+         style="stop-color:#2c568c;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4176-9-0"
+       id="linearGradient13416"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.45408812,0,0,0.45408812,-19.439922,7.2711048)"
+       x1="17.160095"
+       y1="14.004482"
+       x2="37.969398"
+       y2="56.575912" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7210-8-1"
+       id="linearGradient13418"
+       gradientUnits="userSpaceOnUse"
+       x1="24"
+       y1="16.525082"
+       x2="24"
+       y2="13.284962" />
+    <linearGradient
+       id="linearGradient9350">
+      <stop
+         id="stop9352"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop9354"
+         offset="1.0000000"
+         style="stop-color:#bfbebf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6924-1-0"
+       id="linearGradient13421"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.47256308,0,0,0.47256308,-19.765711,7.8656218)"
+       x1="15.972866"
+       y1="16.641634"
+       x2="15.785715"
+       y2="30" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4134-9-5-6-7"
+       id="linearGradient9470-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0768062,20.160914,4.7996577)"
+       x1="9.9747334"
+       y1="31.09375"
+       x2="37.077564"
+       y2="31.09375" />
+    <linearGradient
+       id="linearGradient4134-9-5-6-7">
+      <stop
+         id="stop4136-4-7-1-4"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop4148-8-9-9-0" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop4142-8-2-02-9" />
+      <stop
+         id="stop4138-2-3-6-4"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4206-4-7-8-8"
+       id="linearGradient9472-8"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0768062,20.160914,4.7996577)"
+       x1="25.064732"
+       y1="21.857143"
+       x2="25.207588"
+       y2="25.428572" />
+    <linearGradient
+       id="linearGradient4206-4-7-8-8">
+      <stop
+         id="stop4208-5-9-9-2"
+         offset="0.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop4210-5-3-6-4"
+         offset="1.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4176-3-2-5"
+       id="linearGradient9474-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.160914,4.6630501)"
+       x1="17.160095"
+       y1="14.004482"
+       x2="37.969398"
+       y2="56.575912" />
+    <linearGradient
+       id="linearGradient4176-3-2-5"
+       inkscape:collect="always">
+      <stop
+         id="stop4178-8-5-1"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4180-1-8-7"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7210-7-1-8-1"
+       id="linearGradient9476-1"
+       gradientUnits="userSpaceOnUse"
+       x1="24"
+       y1="16.525082"
+       x2="24"
+       y2="13.284962" />
+    <linearGradient
+       id="linearGradient7210-7-1-8-1">
+      <stop
+         id="stop7212-33-6-5"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop7214-0-6-2"
+         offset="1.0000000"
+         style="stop-color:#bfbebf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="30"
+       x2="15.785715"
+       y1="19.5"
+       x1="16.07143"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.006284,7.5180332)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9517-7"
+       xlink:href="#linearGradient6924-6-1-6"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient6924-6-1-6"
+       inkscape:collect="always">
+      <stop
+         id="stop6926-8-6-1"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop6928-76-7-4"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       y2="30"
+       x2="15.785715"
+       y1="19.5"
+       x1="16.07143"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.006284,7.5180332)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9529"
+       xlink:href="#linearGradient6924-6-1-6"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4134-9-5-6-7"
+       id="linearGradient9602"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0768062,20.160914,4.7996577)"
+       x1="9.9747334"
+       y1="31.09375"
+       x2="37.077564"
+       y2="31.09375" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4206-4-7-8-8"
+       id="linearGradient9604"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0768062,20.160914,4.7996577)"
+       x1="25.064732"
+       y1="21.857143"
+       x2="25.207588"
+       y2="25.428572" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4176-3-2-5"
+       id="linearGradient9606"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.160914,4.6630501)"
+       x1="17.160095"
+       y1="14.004482"
+       x2="37.969398"
+       y2="56.575912" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7210-7-1-8-1"
+       id="linearGradient9608"
+       gradientUnits="userSpaceOnUse"
+       x1="24"
+       y1="16.525082"
+       x2="24"
+       y2="13.284962" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6924-6-1-6"
+       id="linearGradient9610"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.006284,7.5180332)"
+       x1="16.07143"
+       y1="19.5"
+       x2="15.785715"
+       y2="30" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12512"
+       id="radialGradient22609"
+       gradientUnits="userSpaceOnUse"
+       cx="55"
+       cy="125"
+       fx="55"
+       fy="125"
+       r="14.375" />
+    <linearGradient
+       id="linearGradient12512">
+      <stop
+         id="stop12513"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop12517"
+         offset="0.50000000"
+         style="stop-color:#fff520;stop-opacity:0.89108908;" />
+      <stop
+         id="stop12514"
+         offset="1.0000000"
+         style="stop-color:#fff300;stop-opacity:0.0000000;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12512-7"
+       id="radialGradient22609-1"
+       gradientUnits="userSpaceOnUse"
+       cx="55"
+       cy="125"
+       fx="55"
+       fy="125"
+       r="14.375" />
+    <linearGradient
+       id="linearGradient12512-7">
+      <stop
+         id="stop12513-4"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop12517-0"
+         offset="0.50000000"
+         style="stop-color:#fff520;stop-opacity:0.89108908;" />
+      <stop
+         id="stop12514-9"
+         offset="1.0000000"
+         style="stop-color:#fff300;stop-opacity:0.0000000;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4134-9-5-6-8">
+      <stop
+         id="stop4136-4-7-3-7"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop4148-8-9-9-3" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop4142-8-2-3" />
+      <stop
+         id="stop4138-2-3-6-6"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4206-4-7-1">
+      <stop
+         id="stop4208-5-9-0"
+         offset="0.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop4210-5-3-4"
+         offset="1.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7210-7-1-3">
+      <stop
+         id="stop7212-33-15"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop7214-0-7"
+         offset="1.0000000"
+         style="stop-color:#bfbebf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="30"
+       x2="15.785715"
+       y1="19.5"
+       x1="16.07143"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.006284,7.5180332)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient9517-2"
+       xlink:href="#linearGradient6924-6-2"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient6924-6-2"
+       inkscape:collect="always">
+      <stop
+         id="stop6926-8-2"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop6928-76-7-2"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3957-4">
+      <stop
+         style="stop-color:#fffeff;stop-opacity:0.33333334;"
+         offset="0"
+         id="stop3959-2" />
+      <stop
+         style="stop-color:#fffeff;stop-opacity:0.21568628;"
+         offset="1"
+         id="stop3961-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3957-1">
+      <stop
+         style="stop-color:#fffeff;stop-opacity:0.33333334;"
+         offset="0"
+         id="stop3959-25" />
+      <stop
+         style="stop-color:#fffeff;stop-opacity:0.21568628;"
+         offset="1"
+         id="stop3961-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2684-1-6"
+       id="linearGradient8265-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.128181,0,0,1.128181,-108.08145,-78.763896)"
+       x1="70.913956"
+       y1="101.74152"
+       x2="70.951942"
+       y2="88.923729" />
+    <linearGradient
+       id="linearGradient2684-1-6">
+      <stop
+         id="stop2686-7-8"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop2688-4-5"
+         offset="1"
+         style="stop-color:#000000;stop-opacity:1;" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9056-6"
+       id="radialGradient8267-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.05324342,-0.836238,2.019473,0.128568,-206.0078,112.67299)"
+       cx="107.5884"
+       cy="83.990814"
+       fx="107.5884"
+       fy="83.990814"
+       r="12.551644" />
+    <linearGradient
+       id="linearGradient9056-6">
+      <stop
+         style="stop-color:#6acd11;stop-opacity:1"
+         offset="0"
+         id="stop9058-1" />
+      <stop
+         style="stop-color:#4cbe01;stop-opacity:1"
+         offset="1"
+         id="stop9060-8" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9050-2"
+       id="linearGradient8269-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-99.088729,-66.498056)"
+       x1="71.288956"
+       y1="124.11652"
+       x2="70.826942"
+       y2="95" />
+    <linearGradient
+       id="linearGradient9050-2">
+      <stop
+         id="stop9052-7"
+         offset="0"
+         style="stop-color:#428405;stop-opacity:1" />
+      <stop
+         id="stop9054-9"
+         offset="1"
+         style="stop-color:#264a03;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2817-4"
+       id="linearGradient13377"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.624525,0,0,1.054917,-530.24846,-71.839329)"
+       x1="174.83363"
+       y1="84.263489"
+       x2="174.74524"
+       y2="105.49083" />
+    <linearGradient
+       id="linearGradient2817-4">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop2819-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0.48453608;"
+         offset="1"
+         id="stop2821-0" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13364"
+       id="radialGradient13379"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(8.905772e-6,-1.07205,4.98026,-1.250658e-6,-584.92577,217.16695)"
+       cx="169.77171"
+       cy="100.20107"
+       fx="169.77171"
+       fy="100.20107"
+       r="11" />
+    <linearGradient
+       id="linearGradient13364">
+      <stop
+         style="stop-color:#f10a0a;stop-opacity:1"
+         offset="0"
+         id="stop13366" />
+      <stop
+         style="stop-color:#cd0101;stop-opacity:1"
+         offset="1"
+         id="stop13368" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13358"
+       id="linearGradient13381"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.498884,0,0,1.004384,-508.20837,-66.990449)"
+       x1="169"
+       y1="110.33805"
+       x2="169"
+       y2="93.204849" />
+    <linearGradient
+       id="linearGradient13358">
+      <stop
+         style="stop-color:#bd0000;stop-opacity:1"
+         offset="0"
+         id="stop13360" />
+      <stop
+         style="stop-color:#970000;stop-opacity:1"
+         offset="1"
+         id="stop13362" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3081-5"
+       id="linearGradient13383"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.8933072,0,0,0.96437208,-157.89239,5.2328667)"
+       x1="15.089521"
+       y1="15.291994"
+       x2="14"
+       y2="52.510574" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3081-5">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3083-4" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3085-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient52493"
+       id="linearGradient52499"
+       x1="-72.303078"
+       y1="20.700233"
+       x2="-71.390366"
+       y2="31.757452"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient52493">
+      <stop
+         style="stop-color:#f7f7f7;stop-opacity:1;"
+         offset="0"
+         id="stop52495" />
+      <stop
+         style="stop-color:#f7f7f7;stop-opacity:0;"
+         offset="1"
+         id="stop52497" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4499"
+       id="linearGradient4566"
+       gradientUnits="userSpaceOnUse"
+       x1="31.480057"
+       y1="30.844528"
+       x2="32.374863"
+       y2="40.750778" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4499">
+      <stop
+         style="stop-color:#333334;stop-opacity:1;"
+         offset="0"
+         id="stop4501" />
+      <stop
+         style="stop-color:#333334;stop-opacity:0;"
+         offset="1"
+         id="stop4503" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4515"
+       id="radialGradient4568"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.910961,0.03332579,-4.099092e-8,1.3460695,51.082256,-3.4189674)"
+       cx="-54.743732"
+       cy="21.368473"
+       fx="-54.743732"
+       fy="21.368473"
+       r="8.1875" />
+    <linearGradient
+       id="linearGradient4515">
+      <stop
+         style="stop-color:#fbfbfb;stop-opacity:1"
+         offset="0"
+         id="stop4517" />
+      <stop
+         style="stop-color:#729bc6;stop-opacity:1"
+         offset="1"
+         id="stop4519" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4507"
+       id="linearGradient4570"
+       gradientUnits="userSpaceOnUse"
+       x1="30.907085"
+       y1="30.457268"
+       x2="30.937366"
+       y2="39.051018" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4507">
+      <stop
+         style="stop-color:#333334;stop-opacity:1;"
+         offset="0"
+         id="stop4509" />
+      <stop
+         style="stop-color:#333334;stop-opacity:0;"
+         offset="1"
+         id="stop4511" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4523"
+       id="linearGradient4546"
+       gradientUnits="userSpaceOnUse"
+       x1="32.778126"
+       y1="21.726969"
+       x2="33.368801"
+       y2="37.633221"
+       gradientTransform="matrix(1.2528671,0,0,1.2528671,69.53661,-3.4691061)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4523">
+      <stop
+         style="stop-color:#3a3a3b;stop-opacity:1;"
+         offset="0"
+         id="stop4525" />
+      <stop
+         style="stop-color:#3a3a3b;stop-opacity:0;"
+         offset="1"
+         id="stop4527" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4409"
+       id="linearGradient4476"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2528671,0,0,1.2528671,88.9159,-9.402963)"
+       x1="23.710672"
+       y1="27.421602"
+       x2="23.710672"
+       y2="45.734699" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4409">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4411" />
+      <stop
+         style="stop-color:#6e96c1;stop-opacity:1"
+         offset="1"
+         id="stop4413" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4499"
+       id="linearGradient4554"
+       gradientUnits="userSpaceOnUse"
+       x1="31.480057"
+       y1="30.844528"
+       x2="32.374863"
+       y2="40.750778" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4515"
+       id="radialGradient4556"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.910961,0.03332579,-4.099092e-8,1.3460695,51.082256,-3.4189674)"
+       cx="-54.743732"
+       cy="21.368473"
+       fx="-54.743732"
+       fy="21.368473"
+       r="8.1875" />
+    <linearGradient
+       id="linearGradient14544">
+      <stop
+         style="stop-color:#fbfbfb;stop-opacity:1"
+         offset="0"
+         id="stop14546" />
+      <stop
+         style="stop-color:#729bc6;stop-opacity:1"
+         offset="1"
+         id="stop14548" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4507"
+       id="linearGradient4572"
+       gradientUnits="userSpaceOnUse"
+       x1="30.907085"
+       y1="30.457268"
+       x2="30.937366"
+       y2="39.051018" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4523"
+       id="linearGradient4529"
+       x1="32.778126"
+       y1="21.726969"
+       x2="33.368801"
+       y2="37.633221"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2528671,0,0,1.2528671,88.9159,-3.4691061)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4409"
+       id="linearGradient4471"
+       gradientUnits="userSpaceOnUse"
+       x1="23.710672"
+       y1="25.234375"
+       x2="23.710672"
+       y2="43.673359"
+       gradientTransform="matrix(1.2528671,0,0,1.2528671,88.9159,-9.402963)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4417"
+       id="linearGradient4473"
+       gradientUnits="userSpaceOnUse"
+       x1="23.710672"
+       y1="25.234375"
+       x2="23.710672"
+       y2="43.673359"
+       gradientTransform="matrix(1.2528671,0,0,1.2528671,88.9159,-9.402963)" />
+    <linearGradient
+       id="linearGradient4417">
+      <stop
+         style="stop-color:#333333;stop-opacity:1;"
+         offset="0"
+         id="stop4419" />
+      <stop
+         style="stop-color:#6e96c1;stop-opacity:1"
+         offset="1"
+         id="stop4421" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4134-9-5-6-5"
+       id="linearGradient22552"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0768062,20.160914,4.7996577)"
+       x1="9.9747334"
+       y1="31.09375"
+       x2="37.077564"
+       y2="31.09375" />
+    <linearGradient
+       id="linearGradient4134-9-5-6-5">
+      <stop
+         id="stop4136-4-7-1-43"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop4148-8-9-9-1" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop4142-8-2-02-2" />
+      <stop
+         id="stop4138-2-3-6-3"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4206-4-7-8-3"
+       id="linearGradient22554"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0768062,20.160914,4.7996577)"
+       x1="25.064732"
+       y1="21.857143"
+       x2="25.207588"
+       y2="25.428572" />
+    <linearGradient
+       id="linearGradient4206-4-7-8-3">
+      <stop
+         id="stop4208-5-9-9-4"
+         offset="0.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop4210-5-3-6-1"
+         offset="1.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4176-3-2-1"
+       id="linearGradient22556"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.160914,4.6630501)"
+       x1="17.160095"
+       y1="14.004482"
+       x2="37.969398"
+       y2="56.575912" />
+    <linearGradient
+       id="linearGradient4176-3-2-1"
+       inkscape:collect="always">
+      <stop
+         id="stop4178-8-5-3"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4180-1-8-8"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7210-7-1-8-7"
+       id="linearGradient22558"
+       gradientUnits="userSpaceOnUse"
+       x1="24"
+       y1="16.525082"
+       x2="24"
+       y2="13.284962" />
+    <linearGradient
+       id="linearGradient7210-7-1-8-7">
+      <stop
+         id="stop7212-33-6-4"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop7214-0-6-27"
+         offset="1.0000000"
+         style="stop-color:#bfbebf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6924-6-1-7"
+       id="linearGradient22560"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.006284,7.5180332)"
+       x1="16.07143"
+       y1="19.5"
+       x2="15.785715"
+       y2="30" />
+    <linearGradient
+       id="linearGradient6924-6-1-7"
+       inkscape:collect="always">
+      <stop
+         id="stop6926-8-6-9"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop6928-76-7-3"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4409"
+       id="linearGradient14805"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2528671,0,0,1.2528671,88.9159,-9.402963)"
+       x1="23.710672"
+       y1="25.234375"
+       x2="23.710672"
+       y2="43.673359" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4417"
+       id="linearGradient14807"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2528671,0,0,1.2528671,88.9159,-9.402963)"
+       x1="23.710672"
+       y1="25.234375"
+       x2="23.710672"
+       y2="43.673359" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4523"
+       id="linearGradient14809"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2528671,0,0,1.2528671,88.9159,-3.4691061)"
+       x1="32.778126"
+       y1="21.726969"
+       x2="33.368801"
+       y2="37.633221" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4499"
+       id="linearGradient14811"
+       gradientUnits="userSpaceOnUse"
+       x1="31.480057"
+       y1="30.844528"
+       x2="32.374863"
+       y2="40.750778" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4515"
+       id="radialGradient14813"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.910961,0.03332579,-4.099092e-8,1.3460695,51.082256,-3.4189674)"
+       cx="-54.743732"
+       cy="21.368473"
+       fx="-54.743732"
+       fy="21.368473"
+       r="8.1875" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4507"
+       id="linearGradient14815"
+       gradientUnits="userSpaceOnUse"
+       x1="30.907085"
+       y1="30.457268"
+       x2="30.937366"
+       y2="39.051018" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4409"
+       id="linearGradient14817"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2528671,0,0,1.2528671,88.9159,-9.402963)"
+       x1="23.710672"
+       y1="27.421602"
+       x2="23.710672"
+       y2="45.734699" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4523"
+       id="linearGradient14819"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2528671,0,0,1.2528671,69.53661,-3.4691061)"
+       x1="32.778126"
+       y1="21.726969"
+       x2="33.368801"
+       y2="37.633221" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4499"
+       id="linearGradient14821"
+       gradientUnits="userSpaceOnUse"
+       x1="31.480057"
+       y1="30.844528"
+       x2="32.374863"
+       y2="40.750778" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4515"
+       id="radialGradient14823"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.910961,0.03332579,-4.099092e-8,1.3460695,51.082256,-3.4189674)"
+       cx="-54.743732"
+       cy="21.368473"
+       fx="-54.743732"
+       fy="21.368473"
+       r="8.1875" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4507"
+       id="linearGradient14825"
+       gradientUnits="userSpaceOnUse"
+       x1="30.907085"
+       y1="30.457268"
+       x2="30.937366"
+       y2="39.051018" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4134-9-5-6-0"
+       id="linearGradient9602-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0768062,20.160914,4.7996577)"
+       x1="9.9747334"
+       y1="31.09375"
+       x2="37.077564"
+       y2="31.09375" />
+    <linearGradient
+       id="linearGradient4134-9-5-6-0">
+      <stop
+         id="stop4136-4-7-3-1"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop4148-8-9-9-6" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop4142-8-2-2" />
+      <stop
+         id="stop4138-2-3-4"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4206-4-7-5"
+       id="linearGradient9604-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0768062,20.160914,4.7996577)"
+       x1="25.064732"
+       y1="21.857143"
+       x2="25.207588"
+       y2="25.428572" />
+    <linearGradient
+       id="linearGradient4206-4-7-5">
+      <stop
+         id="stop4208-5-9-8"
+         offset="0.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop4210-5-3-8"
+         offset="1.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4176-3-1"
+       id="linearGradient9606-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.160914,4.6630501)"
+       x1="17.160095"
+       y1="14.004482"
+       x2="37.969398"
+       y2="56.575912" />
+    <linearGradient
+       id="linearGradient4176-3-1"
+       inkscape:collect="always">
+      <stop
+         id="stop4178-8-2"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4180-1-1"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7210-7-1-4"
+       id="linearGradient9608-3"
+       gradientUnits="userSpaceOnUse"
+       x1="24"
+       y1="16.525082"
+       x2="24"
+       y2="13.284962" />
+    <linearGradient
+       id="linearGradient7210-7-1-4">
+      <stop
+         id="stop7212-33-9"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop7214-0-8"
+         offset="1.0000000"
+         style="stop-color:#bfbebf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6924-6-2-0"
+       id="linearGradient9610-0"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.006284,7.5180332)"
+       x1="16.07143"
+       y1="19.5"
+       x2="15.785715"
+       y2="30" />
+    <linearGradient
+       id="linearGradient6924-6-2-0"
+       inkscape:collect="always">
+      <stop
+         id="stop6926-8-4"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop6928-76-5"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient20490"
+       id="linearGradient9612"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90770374,0.01394805,-0.01394805,0.90770374,120.12809,-4.1871001)"
+       x1="-78.977859"
+       y1="31.32707"
+       x2="-48.581718"
+       y2="19.79685" />
+    <linearGradient
+       id="linearGradient20490">
+      <stop
+         id="stop20492"
+         offset="0"
+         style="stop-color:#4dbb14;stop-opacity:1" />
+      <stop
+         id="stop20494"
+         offset="1"
+         style="stop-color:#99ea58;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient21771"
+       id="linearGradient9614"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90770374,0.01394805,-0.01394805,0.90770374,120.12809,-4.1871001)"
+       x1="-60.971153"
+       y1="26.995193"
+       x2="-63.190922"
+       y2="18.49259" />
+    <linearGradient
+       id="linearGradient21771">
+      <stop
+         id="stop21773"
+         offset="0"
+         style="stop-color:#7ad73c;stop-opacity:1" />
+      <stop
+         id="stop21775"
+         offset="1"
+         style="stop-color:#52be18;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient20502"
+       id="linearGradient9616"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90770374,0.01394805,-0.01394805,0.90770374,120.12809,-4.1871001)"
+       x1="-60.379169"
+       y1="23.812271"
+       x2="-51.339279"
+       y2="26.261297" />
+    <linearGradient
+       id="linearGradient20502">
+      <stop
+         style="stop-color:#98ea57;stop-opacity:1"
+         offset="0"
+         id="stop20504" />
+      <stop
+         style="stop-color:#60a81a;stop-opacity:1"
+         offset="1"
+         id="stop20506" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7721-9-1"
+       id="linearGradient9618"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91004274,0.01398398,-0.01435387,0.93411362,120.29077,-4.7056724)"
+       x1="-80.638779"
+       y1="22.180561"
+       x2="-45.592064"
+       y2="65.951057" />
+    <linearGradient
+       id="linearGradient7721-9-1">
+      <stop
+         id="stop7723-2-7"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop7725-0"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6817-7"
+       id="linearGradient9620"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.6474497,0.04068148,-0.00509958,0.33186783,222.65672,10.870257)"
+       x1="-60.134838"
+       y1="70.540863"
+       x2="-60.135002"
+       y2="32.559666" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6817-7">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0"
+         id="stop6819-38" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop6821-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6817-7"
+       id="linearGradient9622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.87658866,-1.8443545,0.36168137,-0.17190071,5.515756,-88.361616)"
+       x1="-60.43829"
+       y1="49.03693"
+       x2="-60.549427"
+       y2="26.612957" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6817-7"
+       id="linearGradient9624"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.14875277,-2.0366452,-0.39938996,-0.02917073,84.026391,-103.16204)"
+       x1="-61.105808"
+       y1="85.233597"
+       x2="-60.5989"
+       y2="26.726358" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3957-48"
+       id="linearGradient9626"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.38087698,0,0,0.35432336,78.684959,0.87746894)"
+       x1="21.993773"
+       y1="33.955299"
+       x2="20.917078"
+       y2="15.814602" />
+    <linearGradient
+       id="linearGradient3957-48">
+      <stop
+         style="stop-color:#fffeff;stop-opacity:0.33333334;"
+         offset="0"
+         id="stop3959-3" />
+      <stop
+         style="stop-color:#fffeff;stop-opacity:0.21568628;"
+         offset="1"
+         id="stop3961-01" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient20490-4"
+       id="linearGradient9612-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90770374,0.01394805,-0.01394805,0.90770374,120.12809,-4.1871001)"
+       x1="-78.977859"
+       y1="31.32707"
+       x2="-48.581718"
+       y2="19.79685" />
+    <linearGradient
+       id="linearGradient20490-4">
+      <stop
+         id="stop20492-3"
+         offset="0"
+         style="stop-color:#4dbb14;stop-opacity:1" />
+      <stop
+         id="stop20494-5"
+         offset="1"
+         style="stop-color:#99ea58;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient21771-2"
+       id="linearGradient9614-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90770374,0.01394805,-0.01394805,0.90770374,120.12809,-4.1871001)"
+       x1="-60.971153"
+       y1="26.995193"
+       x2="-63.190922"
+       y2="18.49259" />
+    <linearGradient
+       id="linearGradient21771-2">
+      <stop
+         id="stop21773-6"
+         offset="0"
+         style="stop-color:#7ad73c;stop-opacity:1" />
+      <stop
+         id="stop21775-8"
+         offset="1"
+         style="stop-color:#52be18;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient20502-2"
+       id="linearGradient9616-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90770374,0.01394805,-0.01394805,0.90770374,120.12809,-4.1871001)"
+       x1="-60.379169"
+       y1="23.812271"
+       x2="-51.339279"
+       y2="26.261297" />
+    <linearGradient
+       id="linearGradient20502-2">
+      <stop
+         style="stop-color:#98ea57;stop-opacity:1"
+         offset="0"
+         id="stop20504-9" />
+      <stop
+         style="stop-color:#60a81a;stop-opacity:1"
+         offset="1"
+         id="stop20506-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7721-9-1-4"
+       id="linearGradient9618-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91004274,0.01398398,-0.01435387,0.93411362,120.29077,-4.7056724)"
+       x1="-80.638779"
+       y1="22.180561"
+       x2="-45.592064"
+       y2="65.951057" />
+    <linearGradient
+       id="linearGradient7721-9-1-4">
+      <stop
+         id="stop7723-2-7-5"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop7725-0-0"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6817-7-8"
+       id="linearGradient9620-5"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.6474497,0.04068148,-0.00509958,0.33186783,222.65672,10.870257)"
+       x1="-60.134838"
+       y1="70.540863"
+       x2="-60.135002"
+       y2="32.559666" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6817-7-8">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0"
+         id="stop6819-38-8" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop6821-2-0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6817-7-8"
+       id="linearGradient9622-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.87658866,-1.8443545,0.36168137,-0.17190071,5.515756,-88.361616)"
+       x1="-60.43829"
+       y1="49.03693"
+       x2="-60.549427"
+       y2="26.612957" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6817-7-8"
+       id="linearGradient9624-3"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.14875277,-2.0366452,-0.39938996,-0.02917073,84.026391,-103.16204)"
+       x1="-61.105808"
+       y1="85.233597"
+       x2="-60.5989"
+       y2="26.726358" />
+    <linearGradient
+       y2="26.726358"
+       x2="-60.5989"
+       y1="85.233597"
+       x1="-61.105808"
+       gradientTransform="matrix(0.14875277,-2.0366452,-0.39938996,-0.02917073,84.026391,-103.16204)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient16256"
+       xlink:href="#linearGradient6817-7-8"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3957-1-3"
+       id="linearGradient16439"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.38087698,0,0,0.35432336,78.684959,0.87746894)"
+       x1="21.993773"
+       y1="33.955299"
+       x2="20.917078"
+       y2="15.814602" />
+    <linearGradient
+       id="linearGradient3957-1-3">
+      <stop
+         style="stop-color:#fffeff;stop-opacity:0.33333334;"
+         offset="0"
+         id="stop3959-25-4" />
+      <stop
+         style="stop-color:#fffeff;stop-opacity:0.21568628;"
+         offset="1"
+         id="stop3961-7-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4134-9-5-6-5-1"
+       id="linearGradient24412"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0768062,20.160914,4.7996577)"
+       x1="9.9747334"
+       y1="31.09375"
+       x2="37.077564"
+       y2="31.09375" />
+    <linearGradient
+       id="linearGradient4134-9-5-6-5-1">
+      <stop
+         id="stop4136-4-7-9"
+         offset="0"
+         style="stop-color:#4f79a6;stop-opacity:1;" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.25000000"
+         id="stop4148-8-9-9-7" />
+      <stop
+         style="stop-color:#7fa8d3;stop-opacity:1"
+         offset="0.45037496"
+         id="stop4142-8-2-2-7" />
+      <stop
+         id="stop4138-2-3-0"
+         offset="1"
+         style="stop-color:#547ba6;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4206-4-7-86"
+       id="linearGradient24414"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0768062,20.160914,4.7996577)"
+       x1="25.064732"
+       y1="21.857143"
+       x2="25.207588"
+       y2="25.428572" />
+    <linearGradient
+       id="linearGradient4206-4-7-86">
+      <stop
+         id="stop4208-5-9-7"
+         offset="0.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+      <stop
+         id="stop4210-5-3-08"
+         offset="1.0000000"
+         style="stop-color:#3465a4;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4176-3-8"
+       id="linearGradient24416"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.160914,4.6630501)"
+       x1="17.160095"
+       y1="14.004482"
+       x2="37.969398"
+       y2="56.575912" />
+    <linearGradient
+       id="linearGradient4176-3-8"
+       inkscape:collect="always">
+      <stop
+         id="stop4178-8-3"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop4180-1-0"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7210-7-1-6"
+       id="linearGradient24418"
+       gradientUnits="userSpaceOnUse"
+       x1="24"
+       y1="16.525082"
+       x2="24"
+       y2="13.284962" />
+    <linearGradient
+       id="linearGradient7210-7-1-6">
+      <stop
+         id="stop7212-33-20"
+         offset="0.0000000"
+         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+      <stop
+         id="stop7214-0-2"
+         offset="1.0000000"
+         style="stop-color:#bfbebf;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6924-6-4"
+       id="linearGradient24420"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.006284,7.5180332)"
+       x1="16.07143"
+       y1="19.5"
+       x2="15.785715"
+       y2="30" />
+    <linearGradient
+       id="linearGradient6924-6-4"
+       inkscape:collect="always">
+      <stop
+         id="stop6926-8-1"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         id="stop6928-76-83"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10197-6"
+       id="linearGradient24422"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90770374,0.01394805,-0.01394805,0.90770374,220.14387,8.0702099)"
+       x1="-78.977859"
+       y1="31.32707"
+       x2="-48.581718"
+       y2="19.79685" />
+    <linearGradient
+       id="linearGradient10197-6">
+      <stop
+         style="stop-color:#ca1c0a;stop-opacity:1"
+         offset="0"
+         id="stop10199-3" />
+      <stop
+         style="stop-color:#f05034;stop-opacity:1"
+         offset="1"
+         id="stop10201-4" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10203-8"
+       id="linearGradient24424"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90770374,0.01394805,-0.01394805,0.90770374,220.14387,8.0702099)"
+       x1="-60.971153"
+       y1="26.995193"
+       x2="-63.190922"
+       y2="18.49259" />
+    <linearGradient
+       id="linearGradient10203-8">
+      <stop
+         id="stop10205-8"
+         offset="0"
+         style="stop-color:#e13c24;stop-opacity:1" />
+      <stop
+         id="stop10207-3"
+         offset="1"
+         style="stop-color:#ca1c0a;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient10209-7"
+       id="linearGradient24426"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.90770374,0.01394805,-0.01394805,0.90770374,220.14387,8.0702099)"
+       x1="-60.379169"
+       y1="23.812271"
+       x2="-51.339279"
+       y2="26.261297" />
+    <linearGradient
+       id="linearGradient10209-7">
+      <stop
+         id="stop10211-3"
+         offset="0"
+         style="stop-color:#e64229;stop-opacity:1" />
+      <stop
+         id="stop10213-5"
+         offset="1"
+         style="stop-color:#cc1f0d;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7721-9-1-40"
+       id="linearGradient24428"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.91004274,0.01398398,-0.01435387,0.93411362,220.30655,7.5516376)"
+       x1="-80.638779"
+       y1="22.180561"
+       x2="-45.592064"
+       y2="65.951057" />
+    <linearGradient
+       id="linearGradient7721-9-1-40">
+      <stop
+         id="stop7723-2-7-9"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1" />
+      <stop
+         id="stop7725-0-4"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6817-7-0"
+       id="linearGradient24430"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.6474497,0.04068148,-0.00509958,0.33186783,322.6725,23.127567)"
+       x1="-60.134838"
+       y1="70.540863"
+       x2="-60.225922"
+       y2="23.254047" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient6817-7-0">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0"
+         id="stop6819-38-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop6821-2-2" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6817-7-0"
+       id="linearGradient24432"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-0.87658866,-1.8443545,0.36168137,-0.17190071,105.53154,-76.104306)"
+       x1="-60.43829"
+       y1="49.03693"
+       x2="-60.549427"
+       y2="26.612957" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient6817-7-0"
+       id="linearGradient24434"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.14875277,-2.0366452,-0.39938996,-0.02917073,184.04217,-90.904731)"
+       x1="-61.105808"
+       y1="85.233597"
+       x2="-60.5989"
+       y2="26.726358" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11503-8"
+       id="linearGradient24436"
+       gradientUnits="userSpaceOnUse"
+       x1="31.542158"
+       y1="27.633146"
+       x2="39.232777"
+       y2="40.738911" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient11503-8">
+      <stop
+         style="stop-color:#ef2929"
+         offset="0"
+         id="stop11505-6" />
+      <stop
+         style="stop-color:#cc0000"
+         offset="1"
+         id="stop11507-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3957-4-4"
+       id="linearGradient24438"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.509273,0,0,0.473768,23.78749,24.00915)"
+       x1="21.993773"
+       y1="33.955299"
+       x2="20.917078"
+       y2="15.814602" />
+    <linearGradient
+       id="linearGradient3957-4-4">
+      <stop
+         style="stop-color:#fffeff;stop-opacity:0.33333334;"
+         offset="0"
+         id="stop3959-2-8" />
+      <stop
+         style="stop-color:#fffeff;stop-opacity:0.21568628;"
+         offset="1"
+         id="stop3961-0-8" />
+    </linearGradient>
+    <linearGradient
+       y2="30"
+       x2="15.785715"
+       y1="19.5"
+       x1="16.07143"
+       gradientTransform="matrix(1.08241,0,0,1.0802618,20.006284,7.5180332)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7311"
+       xlink:href="#linearGradient6924-6-4"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11503-8-2"
+       id="linearGradient10186"
+       gradientUnits="userSpaceOnUse"
+       x1="31.542158"
+       y1="27.633146"
+       x2="39.232777"
+       y2="40.738911" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient11503-8-2">
+      <stop
+         style="stop-color:#ef2929"
+         offset="0"
+         id="stop11505-6-4" />
+      <stop
+         style="stop-color:#cc0000"
+         offset="1"
+         id="stop11507-7-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3957-4-5"
+       id="linearGradient10188"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.509273,0,0,0.473768,23.78749,24.00915)"
+       x1="21.993773"
+       y1="33.955299"
+       x2="20.917078"
+       y2="15.814602" />
+    <linearGradient
+       id="linearGradient3957-4-5">
+      <stop
+         style="stop-color:#fffeff;stop-opacity:0.33333334;"
+         offset="0"
+         id="stop3959-2-1" />
+      <stop
+         style="stop-color:#fffeff;stop-opacity:0.21568628;"
+         offset="1"
+         id="stop3961-0-7" />
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.6568542"
+     inkscape:cx="-2.9690127"
+     inkscape:cy="24.028461"
+     inkscape:current-layer="g6615"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="726"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3378">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g7697"
+       transform="matrix(0.67445281,0,0,0.67445281,-191.41209,85.380144)" />
+    <g
+       id="g7697-0"
+       transform="matrix(0.67445281,0,0,0.67445281,-191.41209,85.380144)" />
+    <g
+       id="g7697-1"
+       transform="matrix(0.67445281,0,0,0.67445281,-191.41209,85.380144)" />
+    <g
+       id="g7697-3"
+       transform="matrix(0.67445281,0,0,0.67445281,-191.41209,85.380144)" />
+    <g
+       id="g6615"
+       transform="translate(-95.5,0)">
+      <g
+         transform="matrix(-1.1587832,0,0,1.1525756,303.96805,-13.576042)"
+         id="g21727">
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path21671"
+           d="m 145.52989,27.793162 0.0371,7.30215 20.44526,3.589106 0.12181,-7.865513 z"
+           style="fill:url(#linearGradient24422);fill-opacity:1;stroke:none" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path21673"
+           d="m 145.52409,27.795211 8.14425,-3.354298 20.08286,2.920461 -7.6184,3.460248 z"
+           style="fill:url(#linearGradient24424);fill-opacity:1;stroke:none" />
+        <path
+           sodipodi:nodetypes="ccccc"
+           inkscape:connector-curvature="0"
+           id="path21675"
+           d="m 166.12008,30.824956 -0.085,7.896819 7.27053,-4.892126 0.39827,-6.510014 z"
+           style="fill:url(#linearGradient24426);fill-opacity:1;stroke:none" />
+        <path
+           sodipodi:nodetypes="ccccccccccccccc"
+           inkscape:connector-curvature="0"
+           id="path21677"
+           d="m 153.66438,25.02508 c -2.66643,1.074217 -7.32161,2.796413 -7.32161,2.796413 l 0.007,7.017683 19.71847,3.95873 6.77264,-4.707984 0.15268,-6.238945 c 0,0 -13.41372,-2.731117 -19.32909,-2.825895 z m 0.0979,0.544614 18.40297,2.436419 -0.0738,5.846804 -6.00725,3.776425 -18.74242,-3.469609 0.0867,-6.320942 z"
+           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.41150441;color:#000000;fill:url(#linearGradient24428);fill-opacity:1;stroke:none;stroke-width:1.53600001;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+        <path
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0"
+           id="path21679"
+           d="m 166.079,30.820784 -0.13165,8.30955"
+           style="opacity:0.37168142;fill:#cedcc2;fill-opacity:1;stroke:url(#linearGradient24430);stroke-width:0.9374491px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="ccccccccccccccccc"
+           inkscape:connector-curvature="0"
+           id="path21681"
+           d="m 153.64666,24.402076 c 0,0 -5.31325,1.954668 -7.88129,3.047675 l -0.24781,0.09011 0,0.270339 0.0451,7.389259 20.6208,4.033511 7.49315,-4.875522 0.0873,-7.075886 -20.11718,-2.87949 z m 0.0505,0.617405 19.30082,2.847517 -0.0873,6.268968 -6.9074,4.30852 -19.65048,-3.605476 -0.01,-7.017191 z"
+           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#840100;fill-opacity:1;stroke:#840100;stroke-width:0.13527358;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+        <path
+           sodipodi:nodetypes="ccccccc"
+           inkscape:connector-curvature="0"
+           id="path21683"
+           d="m 171.841,27.965939 -6.22788,2.836559 0.91532,0.0092 -0.002,0.231976 5.63042,-2.700313 -0.005,-0.346342 z"
+           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.5;color:#000000;fill:url(#linearGradient24432);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.25439572px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+        <path
+           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:0.5;color:#000000;fill:url(#linearGradient24434);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.25439572px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+           d="m 148.22573,27.608798 17.80115,3.017916 -0.40616,0.180949 -0.009,0.38622 -18.12861,-2.83368 0.0446,-0.458495 z"
+           id="path21685"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccc" />
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/offline_brick_alert.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/offline_brick_alert.svg
index 5bc030db..5bc030db 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/offline_brick_alert.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/offline_brick_alert.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/offline_server.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/offline_server.svg
index f1f50c40..f1f50c40 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/offline_server.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/offline_server.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/offline_volume.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/offline_volume.svg
index 8146a910..8146a910 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/offline_volume.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/offline_volume.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/online-8x8.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/online-8x8.svg
index 8cef7653..8cef7653 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/online-8x8.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/online-8x8.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/online.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/online.svg
index c25a4232..c25a4232 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/online.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/online.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/remove-server.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/remove-server.svg
index 4280df60..4280df60 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/remove-server.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/remove-server.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/remove_brick.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/remove_brick.svg
index 450b24c8..450b24c8 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/remove_brick.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/remove_brick.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/remove_volume.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/remove_volume.svg
index 83055628..83055628 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/remove_volume.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/remove_volume.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/reset_volume_option.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/reset_volume_option.svg
index cd048c2b..cd048c2b 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/reset_volume_option.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/reset_volume_option.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/running_task.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/running_task.svg
index d9cf0582..d9cf0582 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/running_task.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/running_task.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/star-8x8.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/star-8x8.svg
index f3027569..f3027569 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/star-8x8.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/star-8x8.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/start-volume-disabled.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/start-volume-disabled.svg
index 3ef559c7..3ef559c7 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/start-volume-disabled.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/start-volume-disabled.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/start_volume.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/start_volume.svg
index 5e738c33..5e738c33 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/start_volume.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/start_volume.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/stop_volume.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/stop_volume.svg
index 315bb09b..315bb09b 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/stop_volume.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/stop_volume.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_clear.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_clear.svg
index 02b0b919..02b0b919 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_clear.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_clear.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_commit.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_commit.svg
index 29817471..29817471 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_commit.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_commit.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_pause.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_pause.svg
index ff9b5f3e..ff9b5f3e 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_pause.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_pause.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_paused.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_paused.svg
index 9d6930e1..9d6930e1 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_paused.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_paused.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_resume.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_resume.svg
index 2bd8732c..2bd8732c 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_resume.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_resume.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_running.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_running.svg
index fa15b7b8..fa15b7b8 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_running.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_running.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_status_completed.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_status_completed.svg
index ce0bf238..ce0bf238 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_status_completed.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_status_completed.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_status_error.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_status_error.svg
index 5fb8b116..5fb8b116 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_status_error.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_status_error.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_stop.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_stop.svg
index 07227fd4..07227fd4 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_stop.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_stop.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/task_stopped.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/task_stopped.svg
index d900f03f..d900f03f 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/task_stopped.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/task_stopped.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/utilities-terminal.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/utilities-terminal.svg
index 995fb90b..995fb90b 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/utilities-terminal.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/utilities-terminal.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/view-refresh.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/view-refresh.svg
index 565f6dad..565f6dad 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/view-refresh.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/view-refresh.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/volume.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/volume.svg
index b5e50a46..b5e50a46 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/volume.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/volume.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/volume_option.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/volume_option.svg
index 3fb4a928..3fb4a928 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/volume_option.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/volume_option.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/volume_rebalance.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/volume_rebalance.svg
index 78fdc384..78fdc384 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/volume_rebalance.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/volume_rebalance.svg
diff --git a/src/com.gluster.storage.management.console/icons/tango/scalable/volumes.svg b/src/org.gluster.storage.management.console/icons/tango/scalable/volumes.svg
index 3c99b006..3c99b006 100644
--- a/src/com.gluster.storage.management.console/icons/tango/scalable/volumes.svg
+++ b/src/org.gluster.storage.management.console/icons/tango/scalable/volumes.svg
diff --git a/src/com.gluster.storage.management.console/images/gauge.png b/src/org.gluster.storage.management.console/images/gauge.png
index 6f5764ea..6f5764ea 100644
--- a/src/com.gluster.storage.management.console/images/gauge.png
+++ b/src/org.gluster.storage.management.console/images/gauge.png
diff --git a/src/com.gluster.storage.management.console/images/gauge_small.png b/src/org.gluster.storage.management.console/images/gauge_small.png
index 71e424fe..71e424fe 100644
--- a/src/com.gluster.storage.management.console/images/gauge_small.png
+++ b/src/org.gluster.storage.management.console/images/gauge_small.png
diff --git a/src/com.gluster.storage.management.console/images/gluster-about.png b/src/org.gluster.storage.management.console/images/gluster-about.png
index 9518b2b2..9518b2b2 100644
--- a/src/com.gluster.storage.management.console/images/gluster-about.png
+++ b/src/org.gluster.storage.management.console/images/gluster-about.png
diff --git a/src/com.gluster.storage.management.console/images/login-screen-with-text.psd b/src/org.gluster.storage.management.console/images/login-screen-with-text.psd
index f6e7ab35..f6e7ab35 100644
--- a/src/com.gluster.storage.management.console/images/login-screen-with-text.psd
+++ b/src/org.gluster.storage.management.console/images/login-screen-with-text.psd
diff --git a/src/com.gluster.storage.management.console/images/login-screen.psd b/src/org.gluster.storage.management.console/images/login-screen.psd
index a9bfc27e..a9bfc27e 100644
--- a/src/com.gluster.storage.management.console/images/login-screen.psd
+++ b/src/org.gluster.storage.management.console/images/login-screen.psd
diff --git a/src/com.gluster.storage.management.console/images/splash-dialog.bmp b/src/org.gluster.storage.management.console/images/splash-dialog.bmp
index 932032fb..932032fb 100644
--- a/src/com.gluster.storage.management.console/images/splash-dialog.bmp
+++ b/src/org.gluster.storage.management.console/images/splash-dialog.bmp
diff --git a/src/com.gluster.storage.management.console/images/splash-screen.psd b/src/org.gluster.storage.management.console/images/splash-screen.psd
index 43544f41..43544f41 100644
--- a/src/com.gluster.storage.management.console/images/splash-screen.psd
+++ b/src/org.gluster.storage.management.console/images/splash-screen.psd
diff --git a/src/org.gluster.storage.management.console/plugin.properties b/src/org.gluster.storage.management.console/plugin.properties
new file mode 100644
index 00000000..b61106df
--- /dev/null
+++ b/src/org.gluster.storage.management.console/plugin.properties
@@ -0,0 +1,26 @@
+###############################################################################
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Console.
+#
+# Gluster Management Console 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.
+#
+# Gluster Management Console 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/>.
+###############################################################################
+aboutText=Gluster Management Console\n\
+Version: @VERSION@\n\n\
+Copyright (c) 2011 Gluster, Inc.\n\
+Visit http://www.gluster.com/\n\n\
+This product includes software developed by the\n\
+Eclipse Foundation http://eclipse.org/\n\
+java.net http://jersey.java.net/\n\
+RichClientGUI http://www.richclientgui.com/
diff --git a/src/com.gluster.storage.management.console/plugin.xml b/src/org.gluster.storage.management.console/plugin.xml
index 543b3571..fb9af0eb 100644
--- a/src/com.gluster.storage.management.console/plugin.xml
+++ b/src/org.gluster.storage.management.console/plugin.xml
@@ -1,5 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.4"?>
+<!--
+    Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+    This file is part of Gluster Management Console.
+   
+    Gluster Management Console 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.
+   
+    Gluster Management Console 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/>.
+ -->
+
 <plugin>
 
    <extension
@@ -7,7 +26,7 @@
          point="org.eclipse.core.runtime.applications">
       <application>
          <run
-               class="com.gluster.storage.management.console.Application">
+               class="org.gluster.storage.management.console.Application">
          </run>
       </application>
    </extension>
@@ -15,163 +34,163 @@
          point="org.eclipse.ui.perspectives">
       <perspective
             name="Gluster Perspective"
-            class="com.gluster.storage.management.console.Perspective"
-            id="com.gluster.storage.management.console.Perspective">
+            class="org.gluster.storage.management.console.Perspective"
+            id="org.gluster.storage.management.console.Perspective">
       </perspective>
    </extension>
    <extension
          point="org.eclipse.ui.views">
       <view
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.NavigationView"
-            id="com.gluster.storage.management.console.views.NavigationView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.NavigationView"
+            id="org.gluster.storage.management.console.views.NavigationView"
             name="Cluster Navigation Tree"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.DiscoveredServersView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.DiscoveredServersView"
             icon="icons/tango/16x16/servers.png"
-            id="com.gluster.storage.management.console.views.DiscoveredServersView"
+            id="org.gluster.storage.management.console.views.DiscoveredServersView"
             name="Discovered Servers"
             restorable="true">
       </view>
       <view
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.DiscoveredServerView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.DiscoveredServerView"
             icon="icons/tango/16x16/server.png"
-            id="com.gluster.storage.management.console.views.DiscoveredServerView"
+            id="org.gluster.storage.management.console.views.DiscoveredServerView"
             name="Discovered Server"
             restorable="true">
       </view>
       <category
-            id="com.gluster.storage.management.console.category"
+            id="org.gluster.storage.management.console.category"
             name="Gluster Managament Console">
       </category>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.VolumesView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.VolumesView"
             icon="icons/tango/16x16/volumes.png"
-            id="com.gluster.storage.management.console.views.VolumesView"
+            id="org.gluster.storage.management.console.views.VolumesView"
             name="Volumes"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.VolumesSummaryView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.VolumesSummaryView"
             icon="icons/tango/16x16/gluster_icon.png"
-            id="com.gluster.storage.management.console.views.VolumesSummaryView"
+            id="org.gluster.storage.management.console.views.VolumesSummaryView"
             name="Summary (Volumes)"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.ClusterSummaryView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.ClusterSummaryView"
             icon="icons/tango/16x16/gluster_icon.png"
-            id="com.gluster.storage.management.console.views.ClusterSummaryView"
+            id="org.gluster.storage.management.console.views.ClusterSummaryView"
             name="Summary (Cluster)"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.VolumeSummaryView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.VolumeSummaryView"
             icon="icons/tango/16x16/gluster_icon.png"
-            id="com.gluster.storage.management.console.views.VolumeSummaryView"
+            id="org.gluster.storage.management.console.views.VolumeSummaryView"
             name="Summary (Volume)"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.VolumeBricksView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.VolumeBricksView"
             icon="icons/tango/16x16/bricks.png"
-            id="com.gluster.storage.management.console.views.VolumeBricksView"
+            id="org.gluster.storage.management.console.views.VolumeBricksView"
             name="Bricks"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.VolumeOptionsView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.VolumeOptionsView"
             icon="icons/tango/16x16/volume-options.png"
-            id="com.gluster.storage.management.console.views.VolumeOptionsView"
+            id="org.gluster.storage.management.console.views.VolumeOptionsView"
             name="Volume Options"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.VolumeLogsView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.VolumeLogsView"
             icon="icons/tango/16x16/logs.png"
-            id="com.gluster.storage.management.console.views.VolumeLogsView"
+            id="org.gluster.storage.management.console.views.VolumeLogsView"
             name="Volume Logs"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.GlusterServersSummaryView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.GlusterServersSummaryView"
             icon="icons/tango/16x16/gluster_icon.png"
-            id="com.gluster.storage.management.console.views.GlusterServersSummaryView"
+            id="org.gluster.storage.management.console.views.GlusterServersSummaryView"
             name="Summary (Servers)"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.GlusterServersView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.GlusterServersView"
             icon="icons/tango/16x16/servers.png"
-            id="com.gluster.storage.management.console.views.GlusterServersView"
+            id="org.gluster.storage.management.console.views.GlusterServersView"
             name="Servers"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.DisksView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.DisksView"
             icon="icons/tango/16x16/disk.png"
-            id="com.gluster.storage.management.console.views.DisksView"
+            id="org.gluster.storage.management.console.views.DisksView"
             name="Disks"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.GlusterServerSummaryView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.GlusterServerSummaryView"
             icon="icons/tango/16x16/gluster_icon.png"
-            id="com.gluster.storage.management.console.views.GlusterServerSummaryView"
+            id="org.gluster.storage.management.console.views.GlusterServerSummaryView"
             name="Summary (Server)"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.GlusterServerDisksView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.GlusterServerDisksView"
             icon="icons/tango/16x16/disk.png"
-            id="com.gluster.storage.management.console.views.GlusterServerDisksView"
+            id="org.gluster.storage.management.console.views.GlusterServerDisksView"
             name="Server Disks"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.GlusterServerLogsView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.GlusterServerLogsView"
             icon="icons/tango/16x16/logs.png"
-            id="com.gluster.storage.management.console.views.GlusterServerLogsView"
+            id="org.gluster.storage.management.console.views.GlusterServerLogsView"
             name="Server Logs"
             restorable="true">
       </view>
       <view
             allowMultiple="false"
-            category="com.gluster.storage.management.console.category"
-            class="com.gluster.storage.management.console.views.TasksView"
+            category="org.gluster.storage.management.console.category"
+            class="org.gluster.storage.management.console.views.TasksView"
             icon="icons/tango/16x16/running-task.png"
-            id="com.gluster.storage.management.console.views.TasksView"
+            id="org.gluster.storage.management.console.views.TasksView"
             name="Tasks"
             restorable="true">
       </view>
@@ -180,221 +199,275 @@
          point="org.eclipse.ui.commands">
       <category
             name="Gluster Commands"
-            id="com.gluster.storage.management.console.category">
+            id="org.gluster.storage.management.console.category">
       </category>
       <command
             name="Create Volume"
             description="Create a new Volume"
-            categoryId="com.gluster.storage.management.console.category"
-            id="com.gluster.storage.management.console.commands.CreateVolume">
+            categoryId="org.gluster.storage.management.console.category"
+            id="org.gluster.storage.management.console.commands.CreateVolume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Delete Volume"
-            id="com.gluster.storage.management.console.commands.DeleteVolume"
+            id="org.gluster.storage.management.console.commands.DeleteVolume"
             name="Delete Volume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Start Volume"
-            id="com.gluster.storage.management.console.commands.StartVolume"
+            id="org.gluster.storage.management.console.commands.StartVolume"
             name="Start Volume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Stop Volume"
-            id="com.gluster.storage.management.console.commands.StopVolume"
+            id="org.gluster.storage.management.console.commands.StopVolume"
             name="Stop Volume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Edit Volume"
-            id="com.gluster.storage.management.console.commands.EditVolume"
+            id="org.gluster.storage.management.console.commands.EditVolume"
             name="Edit Volume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Reset all options of a Volume"
-            id="com.gluster.storage.management.console.commands.ResetVolumeOptions"
+            id="org.gluster.storage.management.console.commands.ResetVolumeOptions"
             name="Reset Options">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Rebalance Volume"
-            id="com.gluster.storage.management.console.commands.RebalanceVolume"
+            id="org.gluster.storage.management.console.commands.RebalanceVolume"
             name="Rebalance Volume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Add Server(s) to Cluster"
-            id="com.gluster.storage.management.console.commands.AddServer"
+            id="org.gluster.storage.management.console.commands.AddServer"
             name="Add Server(s)">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Remove Server(s) from Cluster"
-            id="com.gluster.storage.management.console.commands.RemoveServer"
+            id="org.gluster.storage.management.console.commands.RemoveServer"
             name="Remove Server(s)">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Migrate Brick"
-            id="com.gluster.storage.management.console.commands.MigrateDisk"
+            id="org.gluster.storage.management.console.commands.MigrateDisk"
             name="Migrate Brick">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Remove Brick"
-            id="com.gluster.storage.management.console.commands.RemoveDisk"
+            id="org.gluster.storage.management.console.commands.RemoveDisk"
             name="Remove Brick">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Add Brick"
-            id="com.gluster.storage.management.console.commands.AddDisk"
+            id="org.gluster.storage.management.console.commands.AddDisk"
             name="Add Brick">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Pause Task"
-            id="com.gluster.storage.management.console.commands.Pause"
+            id="org.gluster.storage.management.console.commands.Pause"
             name="Pause">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Resume Task"
-            id="com.gluster.storage.management.console.commands.Resume"
+            id="org.gluster.storage.management.console.commands.Resume"
             name="Resume">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Stop Task"
-            id="com.gluster.storage.management.console.commands.Stop"
+            id="org.gluster.storage.management.console.commands.Stop"
             name="Stop">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Delete Task"
-            id="com.gluster.storage.management.console.commands.Delete"
+            id="org.gluster.storage.management.console.commands.Delete"
             name="Delete">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Change Password"
-            id="com.gluster.storage.management.console.commands.ChangePassword"
+            id="org.gluster.storage.management.console.commands.ChangePassword"
             name="Change Password">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Refresh Data"
-            id="com.gluster.storage.management.console.commands.Refresh"
+            id="org.gluster.storage.management.console.commands.Refresh"
             name="Refresh Data">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Terminal"
-            id="com.gluster.storage.management.console.commands.Terminal"
+            id="org.gluster.storage.management.console.commands.Terminal"
             name="Terminal">
       </command>
       <command
-            categoryId="com.gluster.storage.management.console.category"
+            categoryId="org.gluster.storage.management.console.category"
             description="Settings"
-            id="com.gluster.storage.management.console.commands.Preferences"
+            id="org.gluster.storage.management.console.commands.Preferences"
             name="Settings">
       </command>
       <command
             description="Volume Log Rotate"
-            id="com.gluster.storage.management.console.commands.LogRotate"
+            id="org.gluster.storage.management.console.commands.LogRotate"
             name="LogRotate">
       </command>
+      <command
+            categoryId="org.gluster.storage.management.console.category"
+            description="Download Volume Log"
+            id="org.gluster.storage.management.console.commands.DownloadVolumeLogs"
+            name="Download Log">
+      </command>
+      <command
+            categoryId="org.gluster.storage.management.console.category"
+            description="Clear Task"
+            id="org.gluster.storage.management.console.commands.Clear"
+            name="Clear Task">
+      </command>
+      <command
+            categoryId="org.gluster.storage.management.console.category"
+            description="Manual Server Addition"
+            id="org.gluster.storage.management.console.commands.ServerAddition"
+            name="Manual Server Addition">
+      </command>
+      <command
+            categoryId="org.gluster.storage.management.console.category"
+            description="Commit Task"
+            id="org.gluster.storage.management.console.commands.Commit"
+            name="Commit Task">
+      </command>
+      <command
+            categoryId="org.gluster.storage.management.console.category"
+            description="Export SSH Keys"
+            id="org.gluster.storage.management.console.commands.ExportSshKeys"
+            name="Export SSH Keys">
+      </command>
+      <command
+            categoryId="org.gluster.storage.management.console.category"
+            description="Force Start Volume"
+            id="org.gluster.storage.management.console.commands.ForceStartVolume"
+            name="Force Start Volume">
+      </command>
+      <command
+            categoryId="org.gluster.storage.management.console.category"
+            description="Import SSH Keys"
+            id="org.gluster.storage.management.console.commands.ImportSshKeys"
+            name="Import SSH Keys">
+      </command>
+      <command
+            categoryId="org.gluster.storage.management.console.category"
+            description="Support Info"
+            id="org.gluster.storage.management.console.commands.Support"
+            name="Support Info">
+      </command>
+      <command
+            categoryId="org.gluster.storage.management.console.category"
+            description="Manual Server Addition"
+            id="org.gluster.storage.management.console.commands.ServerAddition"
+            name="Manual Server Addition">
+      </command>
    </extension>
    <extension
          point="org.eclipse.ui.bindings">
       <key
-            commandId="com.gluster.storage.management.console.commands.CreateVolume"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.CreateVolume"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+C">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.DeleteVolume"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.DeleteVolume"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+D">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.StartVolume"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.StartVolume"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+S">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.StopVolume"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.StopVolume"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+T">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.EditVolume"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.EditVolume"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+E">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.RebalanceVolume"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.RebalanceVolume"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+B">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.AddServer"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.AddServer"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+A">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.RemoveServer"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.RemoveServer"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+R">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.MigrateDisk"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.MigrateDisk"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+M">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.Preferences"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.Preferences"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+P">
       </key>
       <key
             commandId="org.eclipse.ui.window.showKeyAssist"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+L">
       </key>
       <key
             commandId="org.eclipse.ui.navigate.nextTab"
             contextId="org.eclipse.ui.contexts.window"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="ALT+ARROW_RIGHT">
       </key>
       <key
             commandId="org.eclipse.ui.navigate.previousTab"
             contextId="org.eclipse.ui.contexts.window"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="ALT+ARROW_LEFT">
       </key>
       <scheme
             description="Default Key Bindings Scheme for Gluster Management Console"
-            id="com.gluster.storage.management.console.KeyConfig"
+            id="org.gluster.storage.management.console.KeyConfig"
             name="Gluster">
       </scheme>
       <key
-            commandId="com.gluster.storage.management.console.commands.ResetVolumeOptions"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.ResetVolumeOptions"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+SHIFT+O">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.Refresh"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.Refresh"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="F5">
       </key>
       <key
-            commandId="com.gluster.storage.management.console.commands.Terminal"
-            schemeId="com.gluster.storage.management.console.KeyConfig"
+            commandId="org.gluster.storage.management.console.commands.Terminal"
+            schemeId="org.gluster.storage.management.console.KeyConfig"
             sequence="CTRL+T">
       </key>
    </extension>
@@ -403,7 +476,7 @@
          name="Gluster Management Console"
          point="org.eclipse.core.runtime.products">
       <product
-            application="com.gluster.storage.management.console.application"
+            application="org.gluster.storage.management.console.application"
             name="Gluster Management Console">
          <property
                name="aboutText"
@@ -431,19 +504,18 @@
          point="org.eclipse.ui.actionSets">
       <actionSet
             description="Set of actions that can be performed on multiple Volumes"
-            id="com.gluster.storage.management.console.actionsets.volumes"
+            id="org.gluster.storage.management.console.actionsets.volumes"
             label="Volumes Actions"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.DeleteVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.DeleteVolume"
+               class="org.gluster.storage.management.console.actions.DeleteVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.DeleteVolume"
                disabledIcon="icons/tango/32x32/remove-volume-disabled.png"
                icon="icons/tango/32x32/remove-volume.png"
-               id="com.gluster.storage.management.console.actions.DeleteVolumeAction"
+               id="org.gluster.storage.management.console.actions.DeleteVolumeAction"
                label="&amp;Delete Volume(s)"
-               menubarPath="com.gluster.storage.management.console.actionsets.volumes/volumes"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.actionsets.volumes/volumes"
                retarget="false"
                state="false"
                style="push"
@@ -452,14 +524,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.StopVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.StopVolume"
+               class="org.gluster.storage.management.console.actions.StopVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.StopVolume"
                disabledIcon="icons/tango/32x32/stop-volume-disabled.png"
                icon="icons/tango/32x32/stop-volume.png"
-               id="com.gluster.storage.management.console.actions.StopVolumeAction"
+               id="org.gluster.storage.management.console.actions.StopVolumeAction"
                label="S&amp;top Volume(s)"
-               menubarPath="com.gluster.storage.management.console.actionsets.volumes/volumes"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.actionsets.volumes/volumes"
                retarget="false"
                state="false"
                style="push"
@@ -468,14 +539,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.StartVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.StartVolume"
+               class="org.gluster.storage.management.console.actions.StartVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.StartVolume"
                disabledIcon="icons/tango/32x32/start-volume-disabled.png"
                icon="icons/tango/32x32/start-volume.png"
-               id="com.gluster.storage.management.console.actions.StartVolumeAction"
+               id="org.gluster.storage.management.console.actions.StartVolumeAction"
                label="&amp;Start Volume(s)"
-               menubarPath="com.gluster.storage.management.console.actionsets.volumes/volumes"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.actionsets.volumes/volumes"
                retarget="false"
                state="false"
                style="push"
@@ -484,13 +554,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
+               class="org.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               id="org.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.console.actionsets.volumes/volumes"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.actionsets.volumes/volumes"
                retarget="false"
                state="false"
                style="push"
@@ -499,20 +568,19 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
-               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               class="org.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="org.gluster.storage.management.console.commands.ServerAddition"
+               id="org.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.console.actionsets.volumes/volumes"
+               menubarPath="org.gluster.storage.management.console.actionsets.volumes/volumes"
                mode="FORCE_TEXT"
-               pulldown="false"
                retarget="false"
                state="false"
                style="push"
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.console.actionsets.volumes"
+               id="org.gluster.storage.management.console.actionsets.volumes"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -522,28 +590,28 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed on a single volume"
-            id="com.gluster.storage.management.console.actionsets.volume"
+            id="org.gluster.storage.management.console.actionsets.volume"
             label="Volume Actions"
             visible="false">
          <action
-               class="com.gluster.storage.management.console.actions.ForceStartVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.ForceStartVolume"
-               icon="icons/tango/32x32/start-volume.png"
-               id="com.gluster.storage.management.console.actions.ForceStartVolumeAction"
+               class="org.gluster.storage.management.console.actions.ForceStartVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.ForceStartVolume"
+               disabledIcon="icons/tango/32x32/start-offline-bricks-disabled.png"
+               icon="icons/tango/32x32/start-offline-bricks.png"
+               id="org.gluster.storage.management.console.actions.ForceStartVolumeAction"
                label="Start Offline Bricks"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                style="push"
                toolbarPath="Normal"
                tooltip="Start all Offline Bricks of the selected Volume">
          </action>
          <action
-               class="com.gluster.storage.management.console.actions.VolumeLogRotateAction"
-               definitionId="com.gluster.storage.management.console.commands.LogRotate"
+               class="org.gluster.storage.management.console.actions.VolumeLogRotateAction"
+               definitionId="org.gluster.storage.management.console.commands.LogRotate"
                icon="icons/tango/32x32/log-rotate.png"
-               id="com.gluster.storage.management.console.actions.LogRotateAction"
+               id="org.gluster.storage.management.console.actions.LogRotateAction"
                label="L&amp;og Rotate"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                state="true"
                style="push"
                toolbarPath="Normal"
@@ -551,14 +619,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.MigrateBrickAction"
-               definitionId="com.gluster.storage.management.console.commands.MigrateDisk"
+               class="org.gluster.storage.management.console.actions.MigrateBrickAction"
+               definitionId="org.gluster.storage.management.console.commands.MigrateDisk"
                disabledIcon="icons/tango/32x32/migrate-brick-disabled.png"
                icon="icons/tango/32x32/migrate-brick.png"
-               id="com.gluster.storage.management.console.actions.MigrateDiskAction"
+               id="org.gluster.storage.management.console.actions.MigrateDiskAction"
                label="&amp;Migrate Brick"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                retarget="false"
                state="false"
                style="push"
@@ -566,20 +633,19 @@
                tooltip="Migrate Brick">
                <enablement>
                    <objectClass
-                         name="com.gluster.storage.management.core.model.Brick">
+                         name="org.gluster.storage.management.core.model.Brick">
                    </objectClass>
                </enablement>
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.DeleteVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.DeleteVolume"
+               class="org.gluster.storage.management.console.actions.DeleteVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.DeleteVolume"
                disabledIcon="icons/tango/32x32/remove-volume-disabled.png"
                icon="icons/tango/32x32/remove-volume.png"
-               id="com.gluster.storage.management.console.actions.DeleteVolumeAction"
+               id="org.gluster.storage.management.console.actions.DeleteVolumeAction"
                label="&amp;Delete Volume"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                retarget="false"
                state="false"
                style="push"
@@ -588,13 +654,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.DownloadVolumeLogsAction"
-               definitionId="com.gluster.storage.management.console.commands.DownloadVolumeLogs"
+               class="org.gluster.storage.management.console.actions.DownloadVolumeLogsAction"
+               definitionId="org.gluster.storage.management.console.commands.DownloadVolumeLogs"
                icon="icons/tango/32x32/download-log.png"
-               id="com.gluster.storage.management.console.actions.DownloadVolumeLogsAction"
+               id="org.gluster.storage.management.console.actions.DownloadVolumeLogsAction"
                label="Download &amp;Logs"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                retarget="false"
                state="false"
                style="push"
@@ -603,14 +668,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ResetVolumeOptionsAction"
-               definitionId="com.gluster.storage.management.console.commands.ResetVolumeOptions"
+               class="org.gluster.storage.management.console.actions.ResetVolumeOptionsAction"
+               definitionId="org.gluster.storage.management.console.commands.ResetVolumeOptions"
                disabledIcon="icons/tango/32x32/reset-volume-option-disabled.png"
                icon="icons/tango/32x32/reset-volume-option.png"
-               id="com.gluster.storage.management.console.actions.ResetVolumeOptionsAction"
+               id="org.gluster.storage.management.console.actions.ResetVolumeOptionsAction"
                label="Reset &amp;Options"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                retarget="false"
                state="false"
                style="push"
@@ -619,14 +683,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.RebalanceVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.RebalanceVolume"
+               class="org.gluster.storage.management.console.actions.RebalanceVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.RebalanceVolume"
                disabledIcon="icons/tango/32x32/volume-rebalance-disabled.png"
                icon="icons/tango/32x32/volume-rebalance.png"
-               id="com.gluster.storage.management.console.actions.RebalanceVolumeAction"
+               id="org.gluster.storage.management.console.actions.RebalanceVolumeAction"
                label="&amp;Rebalance Volume"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                retarget="false"
                state="false"
                style="push"
@@ -635,14 +698,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.StopVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.StopVolume"
+               class="org.gluster.storage.management.console.actions.StopVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.StopVolume"
                disabledIcon="icons/tango/32x32/stop-volume-disabled.png"
                icon="icons/tango/32x32/stop-volume.png"
-               id="com.gluster.storage.management.console.actions.StopVolumeAction"
+               id="org.gluster.storage.management.console.actions.StopVolumeAction"
                label="S&amp;top Volume"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                retarget="false"
                state="false"
                style="push"
@@ -651,14 +713,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.StartVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.StartVolume"
+               class="org.gluster.storage.management.console.actions.StartVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.StartVolume"
                disabledIcon="icons/tango/32x32/start-volume-disabled.png"
                icon="icons/tango/32x32/start-volume.png"
-               id="com.gluster.storage.management.console.actions.StartVolumeAction"
+               id="org.gluster.storage.management.console.actions.StartVolumeAction"
                label="&amp;Start Volume"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                retarget="false"
                state="false"
                style="push"
@@ -667,14 +728,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.RemoveBrickAction"
-               definitionId="com.gluster.storage.management.console.commands.RemoveDisk"
+               class="org.gluster.storage.management.console.actions.RemoveBrickAction"
+               definitionId="org.gluster.storage.management.console.commands.RemoveDisk"
                disabledIcon="icons/tango/32x32/remove-brick-disabled.png"
                icon="icons/tango/32x32/remove-brick.png"
-               id="com.gluster.storage.management.console.actions.RemoveDiskAction"
+               id="org.gluster.storage.management.console.actions.RemoveDiskAction"
                label="Remove Brick"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                retarget="false"
                state="false"
                style="push"
@@ -683,14 +743,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.AddBrickAction"
-               definitionId="com.gluster.storage.management.console.commands.AddDisk"
+               class="org.gluster.storage.management.console.actions.AddBrickAction"
+               definitionId="org.gluster.storage.management.console.commands.AddDisk"
                disabledIcon="icons/tango/32x32/add-brick-disabled.png"
                icon="icons/tango/32x32/add-brick.png"
-               id="com.gluster.storage.management.console.actions.AddDiskAction"
+               id="org.gluster.storage.management.console.actions.AddDiskAction"
                label="&amp;Add Brick"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                retarget="false"
                state="false"
                style="push"
@@ -699,14 +758,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
+               class="org.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.CreateVolume"
                disabledIcon="icons/tango/32x32/create-volume-disabled.png"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               id="org.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                retarget="false"
                state="false"
                style="push"
@@ -715,20 +773,19 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
-               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               class="org.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="org.gluster.storage.management.console.commands.ServerAddition"
+               id="org.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.console.menu.volume/volume"
+               menubarPath="org.gluster.storage.management.console.menu.volume/volume"
                mode="FORCE_TEXT"
-               pulldown="false"
                retarget="false"
                state="false"
                style="push"
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.console.menu.volume"
+               id="org.gluster.storage.management.console.menu.volume"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -738,19 +795,18 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed on multiple Gluster Servers"
-            id="com.gluster.storage.management.console.actionsets.glusterservers"
+            id="org.gluster.storage.management.console.actionsets.glusterservers"
             label="Gluster Servers Actions"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.RemoveServerAction"
-               definitionId="com.gluster.storage.management.console.commands.RemoveServer"
+               class="org.gluster.storage.management.console.actions.RemoveServerAction"
+               definitionId="org.gluster.storage.management.console.commands.RemoveServer"
                disabledIcon="icons/tango/32x32/remove-server-disabled.png"
                icon="icons/tango/32x32/remove-server.png"
-               id="com.gluster.storage.management.console.actions.RemoveServerAction"
+               id="org.gluster.storage.management.console.actions.RemoveServerAction"
                label="&amp;Remove Server(s)"
-               menubarPath="com.gluster.storage.management.console.menu.servers/servers"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.servers/servers"
                retarget="false"
                state="false"
                style="push"
@@ -759,13 +815,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
+               class="org.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               id="org.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.console.menu.servers/servers"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.servers/servers"
                retarget="false"
                state="false"
                style="push"
@@ -774,20 +829,19 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
-               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               class="org.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="org.gluster.storage.management.console.commands.ServerAddition"
+               id="org.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.console.menu.servers/servers"
+               menubarPath="org.gluster.storage.management.console.menu.servers/servers"
                mode="FORCE_TEXT"
-               pulldown="false"
                retarget="false"
                state="false"
                style="push"
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.console.menu.servers"
+               id="org.gluster.storage.management.console.menu.servers"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -797,19 +851,18 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed in the &quot;Gluster Server&quot; contextt; context"
-            id="com.gluster.storage.management.console.actionsets.glusterserver"
+            id="org.gluster.storage.management.console.actionsets.glusterserver"
             label="Gluster Server Actions"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.RemoveServerAction"
-               definitionId="com.gluster.storage.management.console.commands.RemoveServer"
+               class="org.gluster.storage.management.console.actions.RemoveServerAction"
+               definitionId="org.gluster.storage.management.console.commands.RemoveServer"
                disabledIcon="icons/tango/32x32/remove-server-disabled.png"
                icon="icons/tango/32x32/remove-server.png"
-               id="com.gluster.storage.management.console.actions.RemoveServerAction"
+               id="org.gluster.storage.management.console.actions.RemoveServerAction"
                label="&amp;Remove Server(s)"
-               menubarPath="com.gluster.storage.management.console.menu.glusterserver/glusterserver"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.glusterserver/glusterserver"
                retarget="false"
                state="false"
                style="push"
@@ -818,13 +871,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
+               class="org.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               id="org.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.console.menu.glusterserver/glusterserver"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.glusterserver/glusterserver"
                retarget="false"
                state="false"
                style="push"
@@ -833,20 +885,19 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
-               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               class="org.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="org.gluster.storage.management.console.commands.ServerAddition"
+               id="org.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.console.menu.glusterserver/glusterserver"
+               menubarPath="org.gluster.storage.management.console.menu.glusterserver/glusterserver"
                mode="FORCE_TEXT"
-               pulldown="false"
                retarget="false"
                state="false"
                style="push"
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.console.menu.glusterserver"
+               id="org.gluster.storage.management.console.menu.glusterserver"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -856,18 +907,17 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed on multiple Discovered Servers"
-            id="com.gluster.storage.management.console.actionsets.serversdiscovered"
+            id="org.gluster.storage.management.console.actionsets.serversdiscovered"
             label="Discovered Servers Actions"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.AddServerAction"
-               definitionId="com.gluster.storage.management.console.commands.AddServer"
+               class="org.gluster.storage.management.console.actions.AddServerAction"
+               definitionId="org.gluster.storage.management.console.commands.AddServer"
                icon="icons/tango/32x32/add-server.png"
-               id="com.gluster.storage.management.console.actions.AddServerAction"
+               id="org.gluster.storage.management.console.actions.AddServerAction"
                label="&amp;Add Server(s)"
-               menubarPath="com.gluster.storage.management.console.menu.discoveredservers/discoveredservers"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.discoveredservers/discoveredservers"
                retarget="false"
                state="false"
                style="push"
@@ -876,13 +926,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
+               class="org.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               id="org.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.console.menu.discoveredservers/discoveredservers"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.discoveredservers/discoveredservers"
                retarget="false"
                state="false"
                style="push"
@@ -891,20 +940,19 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
-               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               class="org.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="org.gluster.storage.management.console.commands.ServerAddition"
+               id="org.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.console.menu.discoveredservers/discoveredservers"
+               menubarPath="org.gluster.storage.management.console.menu.discoveredservers/discoveredservers"
                mode="FORCE_TEXT"
-               pulldown="false"
                retarget="false"
                state="false"
                style="push"
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.console.menu.discoveredservers"
+               id="org.gluster.storage.management.console.menu.discoveredservers"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -914,18 +962,17 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed on single Discovered Server"
-            id="com.gluster.storage.management.console.actionsets.serverdiscovered"
+            id="org.gluster.storage.management.console.actionsets.serverdiscovered"
             label="Discovered Server Actions"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.AddServerAction"
-               definitionId="com.gluster.storage.management.console.commands.AddServer"
+               class="org.gluster.storage.management.console.actions.AddServerAction"
+               definitionId="org.gluster.storage.management.console.commands.AddServer"
                icon="icons/tango/32x32/add-server.png"
-               id="com.gluster.storage.management.console.actions.AddServerAction"
+               id="org.gluster.storage.management.console.actions.AddServerAction"
                label="&amp;Add Server(s)"
-               menubarPath="com.gluster.storage.management.console.menu.discoveredserver/discoveredserver"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.discoveredserver/discoveredserver"
                retarget="false"
                state="false"
                style="push"
@@ -934,13 +981,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
+               class="org.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               id="org.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.console.menu.discoveredserver/discoveredserver"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.discoveredserver/discoveredserver"
                retarget="false"
                state="false"
                style="push"
@@ -949,20 +995,19 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
-               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               class="org.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="org.gluster.storage.management.console.commands.ServerAddition"
+               id="org.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.console.menu.discoveredserver/discoveredserver"
+               menubarPath="org.gluster.storage.management.console.menu.discoveredserver/discoveredserver"
                mode="FORCE_TEXT"
-               pulldown="false"
                retarget="false"
                state="false"
                style="push"
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.console.menu.discoveredserver"
+               id="org.gluster.storage.management.console.menu.discoveredserver"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -972,19 +1017,18 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed from &quot;Cluster&quot; context"
-            id="com.gluster.storage.management.console.actionsets.task"
+            id="org.gluster.storage.management.console.actionsets.task"
             label="Task Action Set"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ClearTaskAction"
-               definitionId="com.gluster.storage.management.console.commands.Clear"
+               class="org.gluster.storage.management.console.actions.ClearTaskAction"
+               definitionId="org.gluster.storage.management.console.commands.Clear"
                disabledIcon="icons/tango/32x32/clear-task-disabled.png"
                icon="icons/tango/32x32/clear-task.png"
-               id="com.gluster.storage.management.console.actions.Clear"
+               id="org.gluster.storage.management.console.actions.Clear"
                label="&amp;Clear Task"
-               menubarPath="com.gluster.storage.management.console.menu.task/task"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.task/task"
                retarget="false"
                state="false"
                style="push"
@@ -993,14 +1037,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CommitTaskAction"
-               definitionId="com.gluster.storage.management.console.commands.Commit"
+               class="org.gluster.storage.management.console.actions.CommitTaskAction"
+               definitionId="org.gluster.storage.management.console.commands.Commit"
                disabledIcon="icons/tango/32x32/commit-task-disabled.png"
                icon="icons/tango/32x32/commit-task.png"
-               id="com.gluster.storage.management.console.actions.Commit"
+               id="org.gluster.storage.management.console.actions.Commit"
                label="&amp;Commit Task"
-               menubarPath="com.gluster.storage.management.console.menu.task/task"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.task/task"
                retarget="false"
                state="false"
                style="push"
@@ -1009,14 +1052,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.StopTaskAction"
-               definitionId="com.gluster.storage.management.console.commands.Stop"
+               class="org.gluster.storage.management.console.actions.StopTaskAction"
+               definitionId="org.gluster.storage.management.console.commands.Stop"
                disabledIcon="icons/tango/32x32/stop-disabled.png"
                icon="icons/tango/32x32/stop.png"
-               id="com.gluster.storage.management.console.actions.Stop"
+               id="org.gluster.storage.management.console.actions.Stop"
                label="&amp;Stop Task"
-               menubarPath="com.gluster.storage.management.console.menu.task/task"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.task/task"
                retarget="false"
                state="false"
                style="push"
@@ -1025,14 +1067,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ResumeTaskAction"
-               definitionId="com.gluster.storage.management.console.commands.Pause"
+               class="org.gluster.storage.management.console.actions.ResumeTaskAction"
+               definitionId="org.gluster.storage.management.console.commands.Pause"
                disabledIcon="icons/tango/32x32/start-disabled.png"
                icon="icons/tango/32x32/start.png"
-               id="com.gluster.storage.management.console.actions.Resume"
+               id="org.gluster.storage.management.console.actions.Resume"
                label="&amp;Resume Task"
-               menubarPath="com.gluster.storage.management.console.menu.task/task"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.task/task"
                retarget="false"
                state="false"
                style="push"
@@ -1041,14 +1082,13 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.PauseTaskAction"
-               definitionId="com.gluster.storage.management.console.commands.Pause"
+               class="org.gluster.storage.management.console.actions.PauseTaskAction"
+               definitionId="org.gluster.storage.management.console.commands.Pause"
                disabledIcon="icons/tango/32x32/pause-disabled.png"
                icon="icons/tango/32x32/pause.png"
-               id="com.gluster.storage.management.console.actions.Pause"
+               id="org.gluster.storage.management.console.actions.Pause"
                label="&amp;Pause Task"
-               menubarPath="com.gluster.storage.management.console.menu.task/task"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.task/task"
                retarget="false"
                state="false"
                style="push"
@@ -1057,13 +1097,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
+               class="org.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               id="org.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.console.menu.task/task"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.task/task"
                retarget="false"
                state="false"
                style="push"
@@ -1071,7 +1110,7 @@
                tooltip="Create a new Volume">
          </action>
          <menu
-               id="com.gluster.storage.management.console.menu.task"
+               id="org.gluster.storage.management.console.menu.task"
                label="&amp;Gluster">
             <groupMarker
                   name="task">
@@ -1080,18 +1119,17 @@
       </actionSet>
       <actionSet
             description="Set of actions that can be performed at Cluster context"
-            id="com.gluster.storage.management.console.actionsets.gluster"
+            id="org.gluster.storage.management.console.actionsets.gluster"
             label="Gluster Actions"
             visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
+               class="org.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.CreateVolume"
                icon="icons/tango/32x32/create-volume.png"
-               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               id="org.gluster.storage.management.console.actions.CreateVolumeAction"
                label="Create &amp;Volume"
-               menubarPath="com.gluster.storage.management.console.menu.gluster/gluster"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.gluster/gluster"
                retarget="false"
                state="false"
                style="push"
@@ -1100,20 +1138,19 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ServerAdditionAction"
-               definitionId="com.gluster.storage.management.console.commands.ServerAddition"
-               id="com.gluster.storage.management.console.actions.ServerAdditionAction"
+               class="org.gluster.storage.management.console.actions.ServerAdditionAction"
+               definitionId="org.gluster.storage.management.console.commands.ServerAddition"
+               id="org.gluster.storage.management.console.actions.ServerAdditionAction"
                label="Add Server"
-               menubarPath="com.gluster.storage.management.console.menu.gluster/gluster"
+               menubarPath="org.gluster.storage.management.console.menu.gluster/gluster"
                mode="FORCE_TEXT"
-               pulldown="false"
                retarget="false"
                state="false"
                style="push"
                tooltip="Manual Server Addition">
          </action>
          <menu
-               id="com.gluster.storage.management.console.menu.gluster"
+               id="org.gluster.storage.management.console.menu.gluster"
                label="&amp;Gluster"
                path="additions">
             <groupMarker
@@ -1123,18 +1160,17 @@
       </actionSet>
       <actionSet
             description="Set of Actions in &quot;Edit&quot; menu"
-            id="com.gluster.storage.management.console.actionsets.edit"
+            id="org.gluster.storage.management.console.actionsets.edit"
             label="Edit Action Set"
             visible="true">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.RefreshDataAction"
-               definitionId="com.gluster.storage.management.console.commands.Refresh"
+               class="org.gluster.storage.management.console.actions.RefreshDataAction"
+               definitionId="org.gluster.storage.management.console.commands.Refresh"
                icon="icons/tango/32x32/view-refresh.png"
-               id="com.gluster.storage.management.console.actions.RefreshDataAction"
+               id="org.gluster.storage.management.console.actions.RefreshDataAction"
                label="&amp;Refresh"
-               menubarPath="com.gluster.storage.management.console.menu.edit/edit"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.edit/edit"
                retarget="false"
                state="false"
                style="push"
@@ -1143,13 +1179,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.PreferencesAction"
-               definitionId="com.gluster.storage.management.console.commands.Preferences"
+               class="org.gluster.storage.management.console.actions.PreferencesAction"
+               definitionId="org.gluster.storage.management.console.commands.Preferences"
                icon="icons/tango/32x32/settings.png"
-               id="com.gluster.storage.management.console.actions.PreferencesAction"
+               id="org.gluster.storage.management.console.actions.PreferencesAction"
                label="&amp;Settings"
-               menubarPath="com.gluster.storage.management.console.menu.edit/edit"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.edit/edit"
                retarget="false"
                state="false"
                style="push"
@@ -1158,13 +1193,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.TerminalAction"
-               definitionId="com.gluster.storage.management.console.commands.Terminal"
+               class="org.gluster.storage.management.console.actions.TerminalAction"
+               definitionId="org.gluster.storage.management.console.commands.Terminal"
                icon="icons/tango/32x32/utilities-terminal.png"
-               id="com.gluster.storage.management.console.actions.TerminalAction"
+               id="org.gluster.storage.management.console.actions.TerminalAction"
                label="&amp;Terminal"
-               menubarPath="com.gluster.storage.management.console.menu.edit/edit"
-               pulldown="false"
+               menubarPath="org.gluster.storage.management.console.menu.edit/edit"
                retarget="false"
                state="false"
                style="push"
@@ -1173,13 +1207,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ChangePasswordAction"
-               definitionId="com.gluster.storage.management.console.commands.ChangePassword"
-               id="com.gluster.storage.management.console.actions.ChangePasswordAction"
+               class="org.gluster.storage.management.console.actions.ChangePasswordAction"
+               definitionId="org.gluster.storage.management.console.commands.ChangePassword"
+               id="org.gluster.storage.management.console.actions.ChangePasswordAction"
                label="&amp;Change Password"
-               menubarPath="com.gluster.storage.management.console.menu.edit/edit"
+               menubarPath="org.gluster.storage.management.console.menu.edit/edit"
                mode="FORCE_TEXT"
-               pulldown="false"
                retarget="false"
                state="false"
                style="push"
@@ -1187,13 +1220,12 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ExportSshKeysAction"
-               definitionId="com.gluster.storage.management.console.commands.ExportSshKeys"
-               id="com.gluster.storage.management.console.actions.ExportSshKeysAction"
+               class="org.gluster.storage.management.console.actions.ExportSshKeysAction"
+               definitionId="org.gluster.storage.management.console.commands.ExportSshKeys"
+               id="org.gluster.storage.management.console.actions.ExportSshKeysAction"
                label="&amp;Export Keys"
-               menubarPath="com.gluster.storage.management.console.menu.edit/edit"
+               menubarPath="org.gluster.storage.management.console.menu.edit/edit"
                mode="FORCE_TEXT"
-               pulldown="false"
                retarget="false"
                state="false"
                style="push"
@@ -1201,20 +1233,19 @@
          </action>
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.ImportSshKeysAction"
-               definitionId="com.gluster.storage.management.console.commands.ImportSshKeys"
-               id="com.gluster.storage.management.console.actions.ImportSshKeysAction"
+               class="org.gluster.storage.management.console.actions.ImportSshKeysAction"
+               definitionId="org.gluster.storage.management.console.commands.ImportSshKeys"
+               id="org.gluster.storage.management.console.actions.ImportSshKeysAction"
                label="&amp;Import Keys"
-               menubarPath="com.gluster.storage.management.console.menu.edit/edit"
+               menubarPath="org.gluster.storage.management.console.menu.edit/edit"
                mode="FORCE_TEXT"
-               pulldown="false"
                retarget="false"
                state="false"
                style="push"
                tooltip="Import SSH keys">
          </action>
          <menu
-               id="com.gluster.storage.management.console.menu.edit"
+               id="org.gluster.storage.management.console.menu.edit"
                label="&amp;Edit"
                path="additions">
             <groupMarker
@@ -1224,19 +1255,18 @@
       </actionSet>
       <actionSet
             description="Set of Actions in &quot;Edit&quot; menu"
-            id="com.gluster.storage.management.console.actionsets.help"
+            id="org.gluster.storage.management.console.actionsets.help"
             label="Help Action Set"
-            visible="true">
+            visible="false">
          <action
                allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.SupportAction"
-               definitionId="com.gluster.storage.management.console.commands.Support"
-               id="com.gluster.storage.management.console.actions.SupportAction"
+               class="org.gluster.storage.management.console.actions.SupportAction"
+               definitionId="org.gluster.storage.management.console.commands.Support"
+               id="org.gluster.storage.management.console.actions.SupportAction"
                label="&amp;Support"
                menubarPath="help/helpEnd"
-               pulldown="false"
                retarget="false"
-               state="false"
+               state="true"
                style="push"
                tooltip="Support Information">
          </action>
@@ -1248,7 +1278,7 @@
             targetID="*">
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.NavigationView"
+               id="org.gluster.storage.management.console.views.NavigationView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
@@ -1260,192 +1290,192 @@
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.ClusterSummaryView"
+               id="org.gluster.storage.management.console.views.ClusterSummaryView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="right"
-               relative="com.gluster.storage.management.console.views.navigator.NavigationView"
+               relative="org.gluster.storage.management.console.views.NavigationView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.DiscoveredServersView"
+               id="org.gluster.storage.management.console.views.DiscoveredServersView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.DiscoveredServerView"
+               id="org.gluster.storage.management.console.views.DiscoveredServerView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.VolumesSummaryView"
+               id="org.gluster.storage.management.console.views.VolumesSummaryView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.VolumesView"
+               id="org.gluster.storage.management.console.views.VolumesView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.VolumesSummaryView"
+               relative="org.gluster.storage.management.console.views.VolumesSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.VolumeSummaryView"
+               id="org.gluster.storage.management.console.views.VolumeSummaryView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.VolumeBricksView"
+               id="org.gluster.storage.management.console.views.VolumeBricksView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.VolumeOptionsView"
+               id="org.gluster.storage.management.console.views.VolumeOptionsView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.VolumeLogsView"
+               id="org.gluster.storage.management.console.views.VolumeLogsView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.GlusterServersSummaryView"
+               id="org.gluster.storage.management.console.views.GlusterServersSummaryView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.GlusterServersView"
+               id="org.gluster.storage.management.console.views.GlusterServersView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.DisksView"
+               id="org.gluster.storage.management.console.views.DisksView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.GlusterServerSummaryView"
+               id="org.gluster.storage.management.console.views.GlusterServerSummaryView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.GlusterServerDisksView"
+               id="org.gluster.storage.management.console.views.GlusterServerDisksView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.GlusterServerLogsView"
+               id="org.gluster.storage.management.console.views.GlusterServerLogsView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
          </view>
          <view
                closeable="false"
-               id="com.gluster.storage.management.console.views.TasksView"
+               id="org.gluster.storage.management.console.views.TasksView"
                minimized="false"
                moveable="false"
                ratio="0.30f"
                relationship="stack"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
@@ -1457,7 +1487,7 @@
                moveable="false"
                ratio="0.60f"
                relationship="bottom"
-               relative="com.gluster.storage.management.console.views.ClusterSummaryView"
+               relative="org.gluster.storage.management.console.views.ClusterSummaryView"
                showTitle="true"
                standalone="false"
                visible="false">
@@ -1468,8 +1498,8 @@
          point="org.eclipse.ui.decorators">
       <decorator
             adaptable="false"
-            class="com.gluster.storage.management.console.views.NavigationTreeLabelDecorator"
-            id="com.gluster.storage.management.console.views.navigator.decorator"
+            class="org.gluster.storage.management.console.views.NavigationTreeLabelDecorator"
+            id="org.gluster.storage.management.console.views.navigator.decorator"
             label="Navigation Tree Decorator"
             lightweight="true"
             location="BOTTOM_LEFT"
@@ -1479,177 +1509,145 @@
    <extension
          point="org.eclipse.ui.preferencePages">
       <page
-            class="com.gluster.storage.management.console.preferences.GlusterPreferencePage"
-            id="com.gluster.storage.management.console.preferences.GlusterPreferencePage"
+            class="org.gluster.storage.management.console.preferences.GlusterPreferencePage"
+            id="org.gluster.storage.management.console.preferences.GlusterPreferencePage"
             name="Gluster">
       </page>
       <page
-            category="com.gluster.storage.management.console.preferences.GlusterPreferencePage"
-            class="com.gluster.storage.management.console.preferences.AlertsPreferencePage"
-            id="com.gluster.storage.management.console.preferences.AlertsPreferencePage"
+            category="org.gluster.storage.management.console.preferences.GlusterPreferencePage"
+            class="org.gluster.storage.management.console.preferences.AlertsPreferencePage"
+            id="org.gluster.storage.management.console.preferences.AlertsPreferencePage"
             name="Alerts">
       </page>
       <page
-            category="com.gluster.storage.management.console.preferences.GlusterPreferencePage"
-            class="com.gluster.storage.management.console.preferences.ChartsPreferencePage"
-            id="com.gluster.storage.management.console.preferences.ChartsPreferencePage"
+            category="org.gluster.storage.management.console.preferences.GlusterPreferencePage"
+            class="org.gluster.storage.management.console.preferences.ChartsPreferencePage"
+            id="org.gluster.storage.management.console.preferences.ChartsPreferencePage"
             name="Charts">
       </page>
    </extension>
    <extension
          point="org.eclipse.core.runtime.preferences">
       <initializer
-            class="com.gluster.storage.management.console.preferences.PreferenceInitializer">
+            class="org.gluster.storage.management.console.preferences.PreferenceInitializer">
       </initializer>
    </extension>
    <extension
          point="org.eclipse.ui.popupMenus">
       <objectContribution
             id="gluster.context.menu.glusterserver"
-            objectClass="com.gluster.storage.management.core.model.GlusterServer">
+            objectClass="org.gluster.storage.management.core.model.GlusterServer">
          <action
-               class="com.gluster.storage.management.console.actions.RemoveServerAction"
-               definitionId="com.gluster.storage.management.console.commands.RemoveServer"
+               class="org.gluster.storage.management.console.actions.RemoveServerAction"
+               definitionId="org.gluster.storage.management.console.commands.RemoveServer"
                enablesFor="+"
-               id="com.gluster.storage.management.console.actions.RemoveServerAction"
+               id="org.gluster.storage.management.console.actions.RemoveServerAction"
                label="&amp;Remove Server"
                menubarPath="additions">
          </action>
       </objectContribution>
       <objectContribution
             id="gluster.context.menu.volume"
-            objectClass="com.gluster.storage.management.core.model.Volume">
+            objectClass="org.gluster.storage.management.core.model.Volume">
          <action
-               allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.MigrateBrickAction"
-               definitionId="com.gluster.storage.management.console.commands.MigrateDisk"
+               class="org.gluster.storage.management.console.actions.MigrateBrickAction"
+               definitionId="org.gluster.storage.management.console.commands.MigrateDisk"
                enablesFor="1"
-               id="com.gluster.storage.management.console.actions.MigrateDiskAction"
+               id="org.gluster.storage.management.console.actions.MigrateDiskAction"
                label="&amp;Migrate Disk"
                menubarPath="additions"
-               pulldown="false"
-               retarget="false"
                state="false"
                style="push"
-               toolbarPath="Normal"
                tooltip="Migrate Disk">
          </action>
          <action
-               allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.DeleteVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.DeleteVolume"
+               class="org.gluster.storage.management.console.actions.DeleteVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.DeleteVolume"
                enablesFor="1"
-               id="com.gluster.storage.management.console.actions.DeleteVolumeAction"
+               id="org.gluster.storage.management.console.actions.DeleteVolumeAction"
                label="&amp;Delete Volume"
                menubarPath="additions"
-               pulldown="false"
-               retarget="false"
                state="false"
                style="push"
-               toolbarPath="Normal"
                tooltip="Delete Volume">
          </action>
          <action
-               allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.RebalanceVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.RebalanceVolume"
+               class="org.gluster.storage.management.console.actions.RebalanceVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.RebalanceVolume"
                enablesFor="1"
-               id="com.gluster.storage.management.console.actions.RebalanceVolumeAction"
+               id="org.gluster.storage.management.console.actions.RebalanceVolumeAction"
                label="&amp;Rebalance Volume"
                menubarPath="additions"
-               pulldown="false"
-               retarget="false"
                state="false"
                style="push"
-               toolbarPath="Normal"
                tooltip="Rebalance Volume">
          </action>
          <action
-               allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.StopVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.StopVolume"
+               class="org.gluster.storage.management.console.actions.StopVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.StopVolume"
                enablesFor="+"
-               id="com.gluster.storage.management.console.actions.StopVolumeAction"
+               id="org.gluster.storage.management.console.actions.StopVolumeAction"
                label="S&amp;top Volume"
                menubarPath="additions"
-               pulldown="false"
-               retarget="false"
                state="false"
                style="push"
-               toolbarPath="Normal"
                tooltip="Stop Volume">
          </action>
          <action
-               allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.StartVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.StartVolume"
+               class="org.gluster.storage.management.console.actions.StartVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.StartVolume"
                enablesFor="+"
-               id="com.gluster.storage.management.console.actions.StartVolumeAction"
+               id="org.gluster.storage.management.console.actions.StartVolumeAction"
                label="&amp;Start Volume"
                menubarPath="additions"
-               pulldown="false"
-               retarget="false"
                state="false"
                style="push"
-               toolbarPath="Normal"
                tooltip="Start Volume">
          </action>
       </objectContribution>
       <objectContribution
             id="gluster.context.menu.server"
-            objectClass="com.gluster.storage.management.core.model.Server">
+            objectClass="org.gluster.storage.management.core.model.Server">
          <action
-               allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.AddServerAction"
-               definitionId="com.gluster.storage.management.console.commands.AddServer"
+               class="org.gluster.storage.management.console.actions.AddServerAction"
+               definitionId="org.gluster.storage.management.console.commands.AddServer"
                enablesFor="+"
-               id="com.gluster.storage.management.console.actions.AddServerAction"
+               id="org.gluster.storage.management.console.actions.AddServerAction"
                label="&amp;Add Server(s)"
                menubarPath="additions"
-               pulldown="false"
-               retarget="false"
                state="false"
                style="push"
-               toolbarPath="Normal"
                tooltip="Add Server(s) to Cluster">
          </action>
          <visibility>
             <not>
                <objectClass
-                     name="com.gluster.storage.management.core.model.GlusterServer">
+                     name="org.gluster.storage.management.core.model.GlusterServer">
                </objectClass>
             </not>
          </visibility>
       </objectContribution>
       <objectContribution
             id="gluster.context.menu.entityGroup"
-            objectClass="com.gluster.storage.management.core.model.EntityGroup">
+            objectClass="org.gluster.storage.management.core.model.EntityGroup">
          <action
-               allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.CreateVolumeAction"
-               definitionId="com.gluster.storage.management.console.commands.CreateVolume"
-               id="com.gluster.storage.management.console.actions.CreateVolumeAction"
+               class="org.gluster.storage.management.console.actions.CreateVolumeAction"
+               definitionId="org.gluster.storage.management.console.commands.CreateVolume"
+               id="org.gluster.storage.management.console.actions.CreateVolumeAction"
                label="&amp;Create Volume"
                menubarPath="additions"
-               pulldown="false"
-               retarget="false"
                state="false"
                style="push"
-               toolbarPath="Normal"
                tooltip="Create a new Volume">
          </action>
          <action
-               allowLabelUpdate="false"
-               class="com.gluster.storage.management.console.actions.AddServerAction"
-               definitionId="com.gluster.storage.management.console.commands.AddServer"
-               id="com.gluster.storage.management.console.actions.AddServerAction"
+               class="org.gluster.storage.management.console.actions.AddServerAction"
+               definitionId="org.gluster.storage.management.console.commands.AddServer"
+               id="org.gluster.storage.management.console.actions.AddServerAction"
                label="&amp;Add Server(s)"
                menubarPath="additions"
-               pulldown="false"
-               retarget="false"
                state="false"
                style="push"
-               toolbarPath="Normal"
                tooltip="Add Server(s) to Cluster">
          </action>
       </objectContribution>
diff --git a/src/org.gluster.storage.management.console/preferences.ini b/src/org.gluster.storage.management.console/preferences.ini
new file mode 100644
index 00000000..5a4c6846
--- /dev/null
+++ b/src/org.gluster.storage.management.console/preferences.ini
@@ -0,0 +1,3 @@
+org.eclipse.ui/KEY_CONFIGURATION_ID = org.gluster.storage.management.console.KeyConfig
+org.eclipse.help.base/help_home=/org.gluster.storage.management.console.help/html/help_home.html
+IWorkbenchPreferenceConstants.SHOW_PROGRESS_ON_STARTUP=true
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.console/splash.bmp b/src/org.gluster.storage.management.console/splash.bmp
index d4510414..d4510414 100644
--- a/src/com.gluster.storage.management.console/splash.bmp
+++ b/src/org.gluster.storage.management.console/splash.bmp
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/Activator.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/Activator.java
index 8edae7f4..9a4eed20 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/Activator.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/Activator.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -28,7 +28,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends AbstractUIPlugin {
 
 	// The plug-in ID
-	public static final String PLUGIN_ID = "com.gluster.storage.management.console"; //$NON-NLS-1$
+	public static final String PLUGIN_ID = "org.gluster.storage.management.console"; //$NON-NLS-1$
 
 	// The shared instance
 	private static Activator plugin;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/AlertsManager.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/AlertsManager.java
index a5b3a4e6..0863a0c5 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/AlertsManager.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/AlertsManager.java
@@ -1,43 +1,41 @@
-/**
- * AlertsManager.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console;
+ *******************************************************************************/
+package org.gluster.storage.management.console;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.gluster.storage.management.console.preferences.PreferenceConstants;
+import org.gluster.storage.management.core.model.Alert;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Partition;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Alert.ALERT_TYPES;
+import org.gluster.storage.management.core.model.Brick.BRICK_STATUS;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.console.preferences.PreferenceConstants;
-import com.gluster.storage.management.core.model.Alert;
-import com.gluster.storage.management.core.model.Alert.ALERT_TYPES;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Brick.BRICK_STATUS;
-import com.gluster.storage.management.core.model.Cluster;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Partition;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
-import com.gluster.storage.management.core.utils.NumberUtil;
 
 public class AlertsManager {
 	private List<Alert> alerts = new ArrayList<Alert>();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/Application.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/Application.java
index e84dac47..f1dc57da 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/Application.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/Application.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,16 +32,16 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.PlatformUI;
+import org.gluster.storage.management.console.dialogs.LoginDialog;
+import org.gluster.storage.management.core.model.Entity;
 
-import com.gluster.storage.management.console.dialogs.LoginDialog;
-import com.gluster.storage.management.core.model.Entity;
 
 /**
  * This class controls all aspects of the application's execution
  */
 public class Application implements IApplication {
 
-	public static final String PLUGIN_ID = "com.gluster.storage.management.console";
+	public static final String PLUGIN_ID = "org.gluster.storage.management.console";
 	private static Application instance;
 	private List<IEntityListener> entityListeners = Collections.synchronizedList(new ArrayList<IEntityListener>());
 	private IStatusLineManager statusLineManager;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationActionBarAdvisor.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ApplicationActionBarAdvisor.java
index e8d2dd8c..b77ddabd 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationActionBarAdvisor.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ApplicationActionBarAdvisor.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.jface.action.GroupMarker;
 import org.eclipse.jface.action.ICoolBarManager;
@@ -32,14 +32,12 @@ import org.eclipse.ui.application.ActionBarAdvisor;
 import org.eclipse.ui.application.IActionBarConfigurer;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
 
 /**
  * An action bar advisor is responsible for creating, adding, and disposing of the actions added to a workbench window.
  * Each window will be populated with new actions.
  */
 public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
-	private IWorkbenchWindow window;
 	/*
 	 * Actions - important to allocate these only in makeActions, and then use them in the fill methods. This ensures
 	 * that the actions aren't recreated when fillActionBars is called with FILL_PROXY.
@@ -48,14 +46,12 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
 	private IWorkbenchAction aboutAction;
 	private IWorkbenchAction helpContentsAction;
 
-	private GUIHelper guiHelper = GUIHelper.getInstance();
 
 	public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
 		super(configurer);
 	}
 
 	protected void makeActions(final IWorkbenchWindow window) {
-		this.window = window;
 		/*
 		 * Creates the actions and registers them. Registering is needed to ensure that key bindings work. The
 		 * corresponding commands keybindings are defined in the plugin.xml file. Registering also provides automatic
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java
index 8d6c81da..9e00c196 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ApplicationWorkbenchAdvisor.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.core.runtime.jobs.IJobChangeEvent;
 import org.eclipse.core.runtime.jobs.Job;
@@ -28,9 +28,9 @@ import org.eclipse.ui.application.IWorkbenchConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchAdvisor;
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
+import org.gluster.storage.management.console.jobs.DataSyncJob;
+import org.gluster.storage.management.console.preferences.PreferenceConstants;
 
-import com.gluster.storage.management.console.jobs.DataSyncJob;
-import com.gluster.storage.management.console.preferences.PreferenceConstants;
 
 /**
  * This workbench advisor creates the window advisor, and specifies
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchWindowAdvisor.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ApplicationWorkbenchWindowAdvisor.java
index 2411dcb5..e73197f5 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ApplicationWorkbenchWindowAdvisor.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ApplicationWorkbenchWindowAdvisor.java
@@ -1,30 +1,30 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.ui.application.ActionBarAdvisor;
 import org.eclipse.ui.application.IActionBarConfigurer;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
+import org.gluster.storage.management.console.utils.GUIHelper;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
 
 public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
 	private final static int DEFAULT_WIDTH = 1024;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/BrickTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/BrickTableLabelProvider.java
index 4796578e..d01f9041 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/BrickTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/BrickTableLabelProvider.java
@@ -1,32 +1,32 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.swt.graphics.Image;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.BricksPage.BRICK_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.console.views.pages.DisksPage.DISK_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Brick.BRICK_STATUS;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.BricksPage.BRICK_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.console.views.pages.DisksPage.DISK_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Brick.BRICK_STATUS;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.utils.NumberUtil;
 
 public class BrickTableLabelProvider extends TableLabelProviderAdapter {
 	private GUIHelper guiHelper = GUIHelper.getInstance();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ConsoleConstants.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ConsoleConstants.java
index 6c7449f2..76aa2e2f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ConsoleConstants.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ConsoleConstants.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/DeviceTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/DeviceTableLabelProvider.java
index 3d8fa432..073b022f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/DeviceTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/DeviceTableLabelProvider.java
@@ -1,35 +1,35 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.jface.resource.FontRegistry;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
 import org.eclipse.swt.graphics.Image;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Partition;
+import org.gluster.storage.management.core.model.Device.DEVICE_STATUS;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.model.Device.DEVICE_STATUS;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Partition;
-import com.gluster.storage.management.core.utils.NumberUtil;
 
 public class DeviceTableLabelProvider extends LabelProvider implements ITableLabelProvider {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/EntityGroupContentProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/EntityGroupContentProvider.java
index 9035e4e2..88c4d9b8 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/EntityGroupContentProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/EntityGroupContentProvider.java
@@ -1,27 +1,27 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
+import org.gluster.storage.management.core.model.EntityGroup;
 
-import com.gluster.storage.management.core.model.EntityGroup;
 
 public class EntityGroupContentProvider<T> implements
 		IStructuredContentProvider {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterDataModelManager.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/GlusterDataModelManager.java
index a6daee79..c9496aa6 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterDataModelManager.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/GlusterDataModelManager.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,41 +26,38 @@ import java.util.Set;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.gluster.storage.management.client.DiscoveredServersClient;
+import org.gluster.storage.management.client.GlusterServersClient;
+import org.gluster.storage.management.client.TasksClient;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.preferences.PreferenceConstants;
+import org.gluster.storage.management.console.utils.GlusterLogger;
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Alert;
+import org.gluster.storage.management.core.model.Alert.ALERT_TYPES;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Brick.BRICK_STATUS;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Device.DEVICE_STATUS;
+import org.gluster.storage.management.core.model.Device.DEVICE_TYPE;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.Event.EVENT_TYPE;
+import org.gluster.storage.management.core.model.GlusterDataModel;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Partition;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+import org.gluster.storage.management.core.model.VolumeOptionInfo;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
 
-import com.gluster.storage.management.client.DiscoveredServersClient;
-import com.gluster.storage.management.client.GlusterServersClient;
-import com.gluster.storage.management.client.TasksClient;
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.preferences.PreferenceConstants;
-import com.gluster.storage.management.console.utils.GlusterLogger;
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Alert;
-import com.gluster.storage.management.core.model.Alert.ALERT_TYPES;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Brick.BRICK_STATUS;
-import com.gluster.storage.management.core.model.Cluster;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.model.Device.DEVICE_STATUS;
-import com.gluster.storage.management.core.model.Device.DEVICE_TYPE;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.Event.EVENT_TYPE;
-import com.gluster.storage.management.core.model.GlusterDataModel;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Partition;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
-import com.gluster.storage.management.core.model.VolumeOptionInfo;
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
 
 public class GlusterDataModelManager {
 	private static GlusterDataModelManager instance = new GlusterDataModelManager();
@@ -485,79 +482,6 @@ public class GlusterDataModelManager {
 		cluster.setAggregatedNetworkStats(new GlusterServersClient().getAggregatedNetworkStats(networkStatsPeriod));
 	}
 
-	private List<TaskInfo> getDummyTasks() {
-		List<TaskInfo> taskInfoList = new ArrayList<TaskInfo>();
-
-		// Task #1
-		TaskInfo taskInfo = new TaskInfo();
-		taskInfo.setType(TASK_TYPE.BRICK_MIGRATE);
-		taskInfo.setName("Migrate Brick-music");
-		taskInfo.setPauseSupported(true);
-		taskInfo.setStopSupported(true);
-		taskInfo.setStatus(new TaskStatus(new Status(Status.STATUS_CODE_PAUSE, "")));
-		
-		taskInfo.getStatus().setMessage("Paused");
-		taskInfo.setDescription("Migrate Brick on volume [Movies] from /export/adb/music to /export/sdc/music.");
-		taskInfoList.add(taskInfo);
-		
-		// Task #2
-		taskInfo = new TaskInfo();
-		taskInfo.setType(TASK_TYPE.DISK_FORMAT);
-		taskInfo.setName("Initialize disk [KVM-GVSA1:sdc]");
-		taskInfo.setPauseSupported(false);
-		taskInfo.setStopSupported(false);
-		taskInfo.setStatus( new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, ""))); 
-		taskInfo.getStatus().setMessage("Format completed 80% ...");
-		taskInfo.setDescription("Formatting disk [KVM-GVSA1:sdc]");
-		taskInfoList.add(taskInfo);
-
-		// Task #2
-		taskInfo = new TaskInfo();
-		taskInfo.setType(TASK_TYPE.VOLUME_REBALANCE);
-		taskInfo.setName("Rebalance volume [songs]");
-		taskInfo.setPauseSupported(false);
-		taskInfo.setStopSupported(false);
-		taskInfo.setStatus( new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, ""))); 
-		taskInfo.getStatus().setMessage("Rebalance step1: layout fix in progress");
-		taskInfo.setDescription("Rebalance volume [songs]");
-		taskInfoList.add(taskInfo);
-		
-		return taskInfoList;
-	}
-	
-	private List<Alert> getDummyAlerts(Cluster cluster) {
-		List<Alert> alerts = new ArrayList<Alert>();
-		for (Server server : cluster.getServers()) {
-			if (alerts.size() == 0) {
-				alerts.add(new Alert(ALERT_TYPES.CPU_USAGE_ALERT, server.getName(),
-						Alert.ALERT_TYPE_STR[ALERT_TYPES.CPU_USAGE_ALERT.ordinal()] + " [93.42 %] in "
-								+ server.getName()));
-				continue;
-			}
-
-			if (alerts.size() == 1) {
-				alerts.add(new Alert(ALERT_TYPES.MEMORY_USAGE_ALERT, server.getName(),
-						Alert.ALERT_TYPE_STR[ALERT_TYPES.MEMORY_USAGE_ALERT.ordinal()] + " [91.83 %] in "
-								+ server.getName()));
-				continue;
-			}
-
-			if (alerts.size() == 2) {
-				alerts.add(new Alert(ALERT_TYPES.OFFLINE_SERVERS_ALERT, server.getName(),
-						Alert.ALERT_TYPE_STR[ALERT_TYPES.OFFLINE_SERVERS_ALERT.ordinal()] + " " + server.getName()));
-				continue;
-			}
-
-			if (alerts.size() == 3) {
-				alerts.add(new Alert(ALERT_TYPES.OFFLINE_VOLUME_BRICKS_ALERT, "songs",
-						Alert.ALERT_TYPE_STR[ALERT_TYPES.OFFLINE_VOLUME_BRICKS_ALERT.ordinal()]
-								+ " [KVM-GVSA4:/export/hdb4/songs] in volume [songs]"));
-				continue;
-			}
-		}
-		return alerts;
-	}
-
 	public void initializeAlerts(Cluster cluster) {
 		AlertsManager alertsManager = new AlertsManager(cluster);
 		alertsManager.buildAlerts();
@@ -758,6 +682,9 @@ public class GlusterDataModelManager {
 			for(Brick brick : volume.getBricks()) {
 				brick.setStatus(BRICK_STATUS.OFFLINE);
 			}
+			for (ClusterListener listener : listeners) {
+				listener.volumeChanged(volume, new Event(EVENT_TYPE.BRICKS_CHANGED, volume.getBricks()));
+			}
 		} else {
 			Volume newVolume = new VolumesClient().getVolume(volume.getName()); //Getting latest brick info
 			updateBricks(volume, volume.getBricks(), newVolume.getBricks());
@@ -765,7 +692,6 @@ public class GlusterDataModelManager {
 		
 		for (ClusterListener listener : listeners) {
 			listener.volumeChanged(volume, new Event(EVENT_TYPE.VOLUME_STATUS_CHANGED, newStatus));
-			listener.volumeChanged(volume, new Event(EVENT_TYPE.BRICKS_CHANGED, volume.getBricks()));
 		}
 	}
 	
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterServerTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/GlusterServerTableLabelProvider.java
index 71d252ef..4defc221 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/GlusterServerTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/GlusterServerTableLabelProvider.java
@@ -1,30 +1,30 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.swt.graphics.Image;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.GlusterServersPage.GLUSTER_SERVER_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.GlusterServersPage.GLUSTER_SERVER_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.utils.NumberUtil;
 
 public class GlusterServerTableLabelProvider extends TableLabelProviderAdapter {
 	private GUIHelper guiHelper = GUIHelper.getInstance();
diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ICommandIds.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ICommandIds.java
new file mode 100644
index 00000000..034042e9
--- /dev/null
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ICommandIds.java
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console;
+
+/**
+ * Interface defining the application's command IDs.
+ * Key bindings can be defined for specific commands.
+ * To associate an action with a command, use IAction.setActionDefinitionId(commandId).
+ *
+ * @see org.eclipse.jface.action.IAction#setActionDefinitionId(String)
+ */
+public interface ICommandIds {
+
+    public static final String CMD_OPEN = "org.gluster.storage.management.console.open";
+    public static final String CMD_OPEN_MESSAGE = "org.gluster.storage.management.console.openMessage";
+    
+}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/IEntityListener.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/IEntityListener.java
index 91d90afe..2ea59eed 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/IEntityListener.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/IEntityListener.java
@@ -1,24 +1,24 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
-import com.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.Entity;
 
 /**
  * Any class that is interested in changes to entities in application scope should implement this interface and register
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/IImageKeys.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/IImageKeys.java
index cecdb002..c1d7dd24 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/IImageKeys.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/IImageKeys.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 public interface IImageKeys {
 	
@@ -81,6 +81,7 @@ public interface IImageKeys {
 	public static final String COMMIT_TASK_32x32 = "icons/tango/32x32/commit-task.png";
 	public static final String PAUSE_TASK_16x16 = "icons/tango/16x16/pause.png";
 	public static final String RESUME_TASK_16x16 = "icons/tango/16x16/start.png";
+	public static final String ERROR_TASK_16x16 = "icons/tango/16x16/error.png";
 	public static final String STOP_TASK_16x16 = "icons/tango/16x16/stop.png";
 	public static final String CLEAR_TASK_16x16 = "icons/tango/16x16/close_task.png";
 	public static final String COMPLETED_TASK_16x16 = "icons/tango/16x16/task-completed.png";
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/NetworkInterfaceTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/NetworkInterfaceTableLabelProvider.java
index 54ed5349..ef04ec36 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/NetworkInterfaceTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/NetworkInterfaceTableLabelProvider.java
@@ -1,27 +1,28 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
+
 
+import org.gluster.storage.management.console.views.GlusterServerSummaryView.NETWORK_INTERFACE_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.NetworkInterface;
 
-import com.gluster.storage.management.console.views.GlusterServerSummaryView.NETWORK_INTERFACE_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.NetworkInterface;
 
 public class NetworkInterfaceTableLabelProvider extends TableLabelProviderAdapter {
 	@Override
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/Perspective.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/Perspective.java
index 9593bb88..ff1cec08 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/Perspective.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/Perspective.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ServerDiskTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ServerDiskTableLabelProvider.java
index d733701c..3f888727 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ServerDiskTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ServerDiskTableLabelProvider.java
@@ -1,34 +1,35 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.swt.graphics.Image;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.ServerDisksPage.SERVER_DISK_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Partition;
+import org.gluster.storage.management.core.model.Device.DEVICE_STATUS;
+import org.gluster.storage.management.core.utils.NumberUtil;
+
+import static org.gluster.storage.management.console.DeviceTableLabelProvider.DEVICE_COLUMN_INDICES;
 
-import static com.gluster.storage.management.console.DeviceTableLabelProvider.DEVICE_COLUMN_INDICES;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.ServerDisksPage.SERVER_DISK_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.model.Device.DEVICE_STATUS;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Partition;
-import com.gluster.storage.management.core.utils.NumberUtil;
 
 public class ServerDiskTableLabelProvider extends TableLabelProviderAdapter {
 	private GUIHelper guiHelper = GUIHelper.getInstance();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ServerTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ServerTableLabelProvider.java
index eccf67ec..6210005e 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/ServerTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/ServerTableLabelProvider.java
@@ -1,30 +1,29 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
+
+import org.gluster.storage.management.console.views.pages.ServersPage.SERVER_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.ServersPage.SERVER_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.utils.NumberUtil;
 
 public class ServerTableLabelProvider extends TableLabelProviderAdapter {
-	private GUIHelper guiHelper = GUIHelper.getInstance();
 
 	@Override
 	public String getColumnText(Object element, int columnIndex) {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/TableLabelProviderAdapter.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/TableLabelProviderAdapter.java
index 5c527082..4a68934a 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/TableLabelProviderAdapter.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/TableLabelProviderAdapter.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ITableLabelProvider;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/TasksTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/TasksTableLabelProvider.java
index 66fbefd3..72f25561 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/TasksTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/TasksTableLabelProvider.java
@@ -1,31 +1,29 @@
-/**
- * TasksTableLabelProvider.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console;
+ *******************************************************************************/
+package org.gluster.storage.management.console;
 
 import org.eclipse.swt.graphics.Image;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.TasksPage.TASK_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.TasksPage.TASK_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
 
 
 public class TasksTableLabelProvider extends TableLabelProviderAdapter {
@@ -50,7 +48,9 @@ public class TasksTableLabelProvider extends TableLabelProviderAdapter {
 			case Status.STATUS_CODE_RUNNING:
 				return guiHelper.getImage(IImageKeys.RESUME_TASK_16x16);
 			case Status.STATUS_CODE_FAILURE:
-				return guiHelper.getImage(IImageKeys.STATUS_OFFLINE_16x16);				
+				return guiHelper.getImage(IImageKeys.STATUS_OFFLINE_16x16);			
+			case Status.STATUS_CODE_ERROR:
+				return guiHelper.getImage(IImageKeys.ERROR_TASK_16x16);
 			default:
 				break;
 			}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeLogTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/VolumeLogTableLabelProvider.java
index 07c5cc77..19e5d211 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeLogTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/VolumeLogTableLabelProvider.java
@@ -1,27 +1,28 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
+
 
+import org.gluster.storage.management.console.views.pages.VolumeLogsPage.LOG_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.core.model.VolumeLogMessage;
+import org.gluster.storage.management.core.utils.DateUtil;
 
-import com.gluster.storage.management.console.views.pages.VolumeLogsPage.LOG_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.core.model.VolumeLogMessage;
-import com.gluster.storage.management.core.utils.DateUtil;
 
 public class VolumeLogTableLabelProvider extends TableLabelProviderAdapter {
 	@Override
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeOptionsContentProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/VolumeOptionsContentProvider.java
index 1289f0f4..6057a3ce 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeOptionsContentProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/VolumeOptionsContentProvider.java
@@ -1,27 +1,27 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
+import org.gluster.storage.management.core.model.VolumeOptions;
 
-import com.gluster.storage.management.core.model.VolumeOptions;
 
 /**
  * @author root
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeOptionsTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/VolumeOptionsTableLabelProvider.java
index 5a1089de..6359a38f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeOptionsTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/VolumeOptionsTableLabelProvider.java
@@ -1,27 +1,28 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import java.util.Map.Entry;
 
-import com.gluster.storage.management.console.views.pages.VolumeOptionsPage.OPTIONS_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.core.model.VolumeOption;
+import org.gluster.storage.management.console.views.pages.VolumeOptionsPage.OPTIONS_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.core.model.VolumeOption;
+
 
 public class VolumeOptionsTableLabelProvider extends TableLabelProviderAdapter {
 	@Override
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeTableLabelProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/VolumeTableLabelProvider.java
index 908c23d5..bbec7f87 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/VolumeTableLabelProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/VolumeTableLabelProvider.java
@@ -1,31 +1,31 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console;
+package org.gluster.storage.management.console;
 
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.swt.graphics.Image;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.VolumesPage.VOLUME_TABLE_COLUMN_INDICES;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.VolumesPage.VOLUME_TABLE_COLUMN_INDICES;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
 public class VolumeTableLabelProvider implements ITableLabelProvider {
 	private GUIHelper guiHelper = GUIHelper.getInstance();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AbstractActionDelegate.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AbstractActionDelegate.java
index 29481286..7ba1f6b5 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AbstractActionDelegate.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AbstractActionDelegate.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -26,9 +26,9 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.IWorkbenchWindowActionDelegate;
 import org.eclipse.ui.internal.UIPlugin;
+import org.gluster.storage.management.console.utils.GlusterLogger;
+import org.gluster.storage.management.core.model.Entity;
 
-import com.gluster.storage.management.console.utils.GlusterLogger;
-import com.gluster.storage.management.core.model.Entity;
 
 /**
  * All action delegates in the application should extend from this class. It provides common functionality of grabbing
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AbstractMonitoredActionDelegate.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AbstractMonitoredActionDelegate.java
index 1669d273..ec3ab027 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AbstractMonitoredActionDelegate.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AbstractMonitoredActionDelegate.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -24,8 +24,8 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
+import org.gluster.storage.management.console.ConsoleConstants;
 
-import com.gluster.storage.management.console.ConsoleConstants;
 
 /**
  * Any action that can potentially run for a long time, and supports monitoring and progress dialog should extend from
@@ -33,7 +33,7 @@ import com.gluster.storage.management.console.ConsoleConstants;
  */
 public abstract class AbstractMonitoredActionDelegate extends AbstractActionDelegate {
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.actions.AbstractActionDelegate#performAction(org.eclipse.jface.action.IAction)
+	 * @see org.gluster.storage.management.console.actions.AbstractActionDelegate#performAction(org.eclipse.jface.action.IAction)
 	 */
 	@Override
 	protected void performAction(final IAction action) {
diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ActionConstants.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ActionConstants.java
new file mode 100644
index 00000000..e5fb8849
--- /dev/null
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ActionConstants.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.actions;
+
+public class ActionConstants {
+	public static final String ACTION_SET_CLUSTER = "org.gluster.storage.management.console.actionsets.gluster";
+	public static final String ACTION_SET_VOLUMES = "org.gluster.storage.management.console.actionsets.volumes";
+	public static final String ACTION_SET_VOLUME = "org.gluster.storage.management.console.actionsets.volume";
+	public static final String ACTION_SET_DISKS = "org.gluster.storage.management.console.actionsets.disks";
+	public static final String ACTION_SET_DISK = "org.gluster.storage.management.console.actionsets.disk";
+	public static final String ACTION_SET_GLUSTER_SERVERS = "org.gluster.storage.management.console.actionsets.glusterservers";
+	public static final String ACTION_SET_GLUSTER_SERVER = "org.gluster.storage.management.console.actionsets.glusterserver";
+	public static final String ACTION_SET_DISCOVERED_SERVERS = "org.gluster.storage.management.console.actionsets.serversdiscovered";
+	public static final String ACTION_SET_DISCOVERED_SERVER = "org.gluster.storage.management.console.actionsets.serverdiscovered";
+	public static final String ACTION_SET_TASK = "org.gluster.storage.management.console.actionsets.task";
+	public static final String ACTION_SET_EDIT = "org.gluster.storage.management.console.actionsets.edit";
+	
+	public static final String COMMAND_CREATE_VOLUME = "org.gluster.storage.management.console.commands.CreateVolume";
+	public static final String COMMAND_ADD_SERVER = "org.gluster.storage.management.console.commands.AddServer";
+}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AddBrickAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AddBrickAction.java
index 479353ff..bcb9524e 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AddBrickAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AddBrickAction.java
@@ -1,37 +1,33 @@
-/**
- * AddBrickAction.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
+ *******************************************************************************/
 
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.wizard.WizardDialog;
+import org.gluster.storage.management.console.dialogs.AddBrickWizard;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.dialogs.AddBrickWizard;
-import com.gluster.storage.management.core.model.Volume;
 
 public class AddBrickAction extends AbstractActionDelegate {
 	private Volume volume;
-	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
 	
 	@Override
 	public void dispose() {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AddServerAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AddServerAction.java
index c3b24eba..f2425d6a 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/AddServerAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/AddServerAction.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import java.net.URI;
 import java.util.HashSet;
@@ -24,16 +24,15 @@ import java.util.Set;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IAction;
+import org.gluster.storage.management.client.GlusterServersClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.dialogs.ServerAdditionDialog;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.Server;
 
-import com.gluster.storage.management.client.GlusterServersClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.dialogs.ServerAdditionDialog;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.Server;
 
 public class AddServerAction extends AbstractMonitoredActionDelegate {
-	private GUIHelper guiHelper = GUIHelper.getInstance();
 	
 	@Override
 	protected void performAction(final IAction action, IProgressMonitor monitor) {
diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ChangePasswordAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ChangePasswordAction.java
new file mode 100644
index 00000000..6f00e004
--- /dev/null
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ChangePasswordAction.java
@@ -0,0 +1,41 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.actions;
+
+import org.eclipse.jface.action.IAction;
+import org.gluster.storage.management.console.dialogs.ChangePasswordDialog;
+
+
+public class ChangePasswordAction extends AbstractActionDelegate {
+
+	@Override
+	protected void performAction(IAction action) {
+		try {
+			// To open a dialog for change password
+			ChangePasswordDialog dialog = new ChangePasswordDialog(getShell());
+			dialog.open();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+	
+	@Override
+	public void dispose() {
+	}
+}
diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ClearTaskAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ClearTaskAction.java
new file mode 100644
index 00000000..d22abe6c
--- /dev/null
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ClearTaskAction.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.actions;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.gluster.storage.management.client.TasksClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+
+
+public class ClearTaskAction extends AbstractActionDelegate {
+	private TaskInfo taskInfo;
+	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
+
+	@Override
+	protected void performAction(final IAction action) {
+		final String actionDesc = action.getDescription();
+
+		try {
+			new TasksClient().deleteTask(taskInfo.getName()); // taskId
+			modelManager.removeTask(taskInfo);
+			action.setEnabled(false); // TODO disable other task buttons
+		} catch (Exception e) {
+			showErrorDialog(actionDesc,
+					"Task [" + taskInfo.getName() + "] could not be cleared! Error: [" + e.getMessage() + "]");
+		}
+	}
+
+	@Override
+	public void selectionChanged(IAction action, ISelection selection) {
+		super.selectionChanged(action, selection);
+		action.setEnabled(false);
+		if (selectedEntity instanceof TaskInfo) {
+			taskInfo = (TaskInfo) selectedEntity;
+			action.setEnabled(taskInfo.getStatus().getCode() == Status.STATUS_CODE_SUCCESS 
+							|| taskInfo.getStatus().getCode() == Status.STATUS_CODE_FAILURE
+							|| taskInfo.getStatus().getCode() == Status.STATUS_CODE_ERROR);
+		} else {
+			action.setEnabled(false);
+		}
+	}
+
+	@Override
+	public void dispose() {
+
+	}
+}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CommitTaskAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/CommitTaskAction.java
index e2e1e12c..7c3c1f1b 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CommitTaskAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/CommitTaskAction.java
@@ -1,18 +1,36 @@
-package com.gluster.storage.management.console.actions;
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.actions;
 
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.widgets.Display;
+import org.gluster.storage.management.client.TasksClient;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.client.TasksClient;
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.core.model.Volume;
 
 public class CommitTaskAction extends AbstractActionDelegate {
 	private TaskInfo taskInfo;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CreateVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/CreateVolumeAction.java
index f8590171..c1f55478 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/CreateVolumeAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/CreateVolumeAction.java
@@ -1,30 +1,30 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
+import org.gluster.storage.management.console.dialogs.CreateVolumeWizard;
 
-import com.gluster.storage.management.console.dialogs.CreateVolumeWizard;
 
 public class CreateVolumeAction extends AbstractActionDelegate {
 	@Override
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DeleteVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/DeleteVolumeAction.java
index b8376e4b..55e6d143 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DeleteVolumeAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/DeleteVolumeAction.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,14 +26,14 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
 public class DeleteVolumeAction extends AbstractMonitoredActionDelegate {
 	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
@@ -82,15 +82,14 @@ public class DeleteVolumeAction extends AbstractMonitoredActionDelegate {
 
 		// Display the success or failure info
 		if (deletedVolumeNames.size() == 0) { // No volume(s) deleted successfully
-			if (!errorMessage.isEmpty()) {
-				showErrorDialog(actionDesc, "Volume(s) could not be deleted! " + CoreConstants.NEWLINE + errorMessage);
-			}
+			showErrorDialog(actionDesc, "Volume(s) could not be deleted! " + CoreConstants.NEWLINE + errorMessage);
 		} else {
 			String info = "Volume(s) " + deletedVolumeNames + " deleted successfully!";
-			if (!errorMessage.isEmpty()) {
+			if (!failedVolumes.isEmpty()) {
 				info += CoreConstants.NEWLINE + CoreConstants.NEWLINE + "Volumes " + failedVolumes
-						+ " could not be deleted!" + errorMessage;
+						+ " could not be deleted!" + CoreConstants.NEWLINE + errorMessage;
 			}
+			
 			if (selectedVolumes.size() == deletedVolumeNames.size()) {
 				showInfoDialog(actionDesc, info);
 			} else {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java
index 81abb01f..1d266070 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/DownloadVolumeLogsAction.java
@@ -1,30 +1,30 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.FileDialog;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Volume;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/EditVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/EditVolumeAction.java
index 610cbdf6..2bbb1618 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/EditVolumeAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/EditVolumeAction.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ExportSshKeysAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ExportSshKeysAction.java
index 51cf49c1..60d11eca 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ExportSshKeysAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ExportSshKeysAction.java
@@ -1,30 +1,28 @@
-/**
- * ExportSshKeysAction.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.actions;
+ *******************************************************************************/
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.FileDialog;
+import org.gluster.storage.management.client.KeysClient;
 
-import com.gluster.storage.management.client.KeysClient;
 
 /**
  * @author root
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ForceStartVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ForceStartVolumeAction.java
index 9201aadb..3cec5515 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ForceStartVolumeAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ForceStartVolumeAction.java
@@ -1,18 +1,36 @@
-package com.gluster.storage.management.console.actions;
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.actions;
 
 import java.util.Set;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.ui.IWorkbenchPart;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.VolumeBricksView;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Brick.BRICK_STATUS;
+import org.gluster.storage.management.core.utils.StringUtil;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.VolumeBricksView;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Brick.BRICK_STATUS;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.utils.StringUtil;
 
 public class ForceStartVolumeAction extends AbstractActionDelegate {
 
diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ImportSshKeysAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ImportSshKeysAction.java
new file mode 100644
index 00000000..5d63a321
--- /dev/null
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ImportSshKeysAction.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.actions;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.FileDialog;
+import org.gluster.storage.management.client.KeysClient;
+
+
+public class ImportSshKeysAction extends AbstractActionDelegate {
+
+	@Override
+	protected void performAction(IAction action) {
+		final KeysClient client = new KeysClient();
+
+		Display.getDefault().asyncExec(new Runnable() {
+			
+			@Override
+			public void run() {
+				FileDialog dialog = new FileDialog(getShell(), SWT.OPEN);
+				dialog.setText("Open");
+				dialog.setFilterNames(new String[] { "ssh-keys (*.tar)" });
+				dialog.setFilterExtensions(new String[] { "*.tar" });
+
+				String selectedFile = dialog.open();
+				if (selectedFile == null) {
+					return;
+				}
+
+				String title = "Import SSH Keys";
+				try {
+					client.importSshKeys(selectedFile);
+					showInfoDialog(title, "SSH keys imported successfully!");
+				} catch (Exception e) {
+					showErrorDialog(title, e.getMessage());
+				}
+			}
+		});		
+	}			
+
+	@Override
+	public void dispose() {
+	}
+}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/MigrateBrickAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/MigrateBrickAction.java
index a8667c33..faf883c8 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/MigrateBrickAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/MigrateBrickAction.java
@@ -1,33 +1,33 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import java.util.Set;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.wizard.WizardDialog;
+import org.gluster.storage.management.console.dialogs.MigrateBrickWizard;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.dialogs.MigrateBrickWizard;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Volume;
 
 public class MigrateBrickAction extends AbstractActionDelegate {
 	private Volume volume;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/MigrateVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/MigrateVolumeAction.java
index 66013222..23d8701e 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/MigrateVolumeAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/MigrateVolumeAction.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/PauseTaskAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/PauseTaskAction.java
index 92a79c73..fc6a4664 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/PauseTaskAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/PauseTaskAction.java
@@ -1,33 +1,31 @@
-/**
- * PauseTaskAction.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.actions;
+ *******************************************************************************/
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
+import org.gluster.storage.management.client.TasksClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.TaskStatus;
 
-import com.gluster.storage.management.client.TasksClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.TaskStatus;
 
 
 public class PauseTaskAction extends AbstractActionDelegate {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/PreferencesAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/PreferencesAction.java
index b81a2a51..8f3f725d 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/PreferencesAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/PreferencesAction.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.ui.actions.ActionFactory;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RebalanceVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RebalanceVolumeAction.java
index 016ffb8b..4e1d7127 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RebalanceVolumeAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RebalanceVolumeAction.java
@@ -1,35 +1,35 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import java.net.URI;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
+import org.gluster.storage.management.client.TasksClient;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.client.TasksClient;
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.Volume;
 
 public class RebalanceVolumeAction extends AbstractActionDelegate {
 	private Volume volume;
@@ -54,7 +54,12 @@ public class RebalanceVolumeAction extends AbstractActionDelegate {
 			if (taskInfo != null) {
 				GlusterDataModelManager.getInstance().addTask(taskInfo);
 			}
-			showInfoDialog(actionDesc, "Volume [" + volume.getName() + "] rebalance started successfully!");
+			if (taskInfo.getStatus().getCode() == Status.STATUS_CODE_ERROR) {
+				showWarningDialog(actionDesc, "Volume [" + volume.getName()
+						+ "] rebalance started, but following error occured: " + taskInfo.getStatus());
+			} else {
+				showInfoDialog(actionDesc, "Volume [" + volume.getName() + "] rebalance started successfully!");
+			}
 			guiHelper.showTaskView();
 		} catch (Exception e) {
 			showErrorDialog(actionDesc, "Volume rebalance could not be started on [" + volume.getName() + "]! Error: ["
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RefreshDataAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RefreshDataAction.java
index 4d492f8d..4c2090b4 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RefreshDataAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RefreshDataAction.java
@@ -1,26 +1,26 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
+import org.gluster.storage.management.console.jobs.DataSyncJob;
 
-import com.gluster.storage.management.console.jobs.DataSyncJob;
 
 /**
  *
@@ -34,7 +34,7 @@ public class RefreshDataAction extends AbstractActionDelegate {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.actions.AbstractActionDelegate#performAction(org.eclipse.jface.action.IAction)
+	 * @see org.gluster.storage.management.console.actions.AbstractActionDelegate#performAction(org.eclipse.jface.action.IAction)
 	 */
 	@Override
 	protected void performAction(IAction action) {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RemoveBrickAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RemoveBrickAction.java
index 105ab0da..e27ad5ec 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RemoveBrickAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RemoveBrickAction.java
@@ -1,4 +1,22 @@
-package com.gluster.storage.management.console.actions;
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.actions;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,16 +28,16 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.IWorkbenchPart;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.VolumeBricksView;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.utils.StringUtil;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.VolumeBricksView;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.utils.StringUtil;
 
 public class RemoveBrickAction extends AbstractActionDelegate {
 	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RemoveServerAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RemoveServerAction.java
index 7f33828a..c911f371 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/RemoveServerAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/RemoveServerAction.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -28,13 +28,13 @@ import java.util.Set;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
+import org.gluster.storage.management.client.GlusterServersClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.utils.GlusterLogger;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.GlusterServer;
 
-import com.gluster.storage.management.client.GlusterServersClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.utils.GlusterLogger;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.GlusterServer;
 
 public class RemoveServerAction extends AbstractMonitoredActionDelegate {
 	private static final GlusterLogger logger = GlusterLogger.getInstance();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ResetVolumeOptionsAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ResetVolumeOptionsAction.java
index cd2b3ff5..eed5e093 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/ResetVolumeOptionsAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ResetVolumeOptionsAction.java
@@ -1,13 +1,31 @@
-package com.gluster.storage.management.console.actions;
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.swt.widgets.Display;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Volume;
 
 public class ResetVolumeOptionsAction extends AbstractActionDelegate {
 	private Volume volume;
@@ -47,7 +65,7 @@ public class ResetVolumeOptionsAction extends AbstractActionDelegate {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * com.gluster.storage.management.console.actions.AbstractActionDelegate#selectionChanged(org.eclipse.jface.action.IAction
+	 * org.gluster.storage.management.console.actions.AbstractActionDelegate#selectionChanged(org.eclipse.jface.action.IAction
 	 * , org.eclipse.jface.viewers.ISelection)
 	 */
 	@Override
diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ResumeTaskAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ResumeTaskAction.java
new file mode 100644
index 00000000..3e39e914
--- /dev/null
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ResumeTaskAction.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.actions;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.gluster.storage.management.client.TasksClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.TaskStatus;
+
+
+public class ResumeTaskAction extends AbstractActionDelegate {
+	private TaskInfo taskInfo;
+	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
+
+	@Override
+	protected void performAction(final IAction action) {
+		final String actionDesc = action.getDescription();
+
+		try {
+			new TasksClient().resumeTask(taskInfo.getName());
+			taskInfo.setStatus(new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, "Resumed")));
+			modelManager.updateTask(taskInfo);
+		} catch (Exception e) {
+			showErrorDialog(actionDesc,
+					"Task [" + taskInfo.getDescription() + "] could not be Resumed! Error: [" + e.getMessage() + "]");
+		}
+	}
+	
+	@Override
+	public void selectionChanged(IAction action, ISelection selection) {
+		super.selectionChanged(action, selection);
+		action.setEnabled(false);
+		if (selectedEntity instanceof TaskInfo) {
+			taskInfo = (TaskInfo) selectedEntity;
+			action.setEnabled(taskInfo.getStatus().getCode() == Status.STATUS_CODE_PAUSE);
+		}
+	}
+	
+	@Override
+	public void dispose() {
+
+	}
+
+}
diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ServerAdditionAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ServerAdditionAction.java
new file mode 100644
index 00000000..d610a9b0
--- /dev/null
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/ServerAdditionAction.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.actions;
+
+import org.eclipse.jface.action.IAction;
+import org.gluster.storage.management.console.dialogs.ServerAdditionDialog;
+import org.gluster.storage.management.console.utils.GlusterLogger;
+
+
+public class ServerAdditionAction extends AbstractActionDelegate {
+	private static final GlusterLogger logger = GlusterLogger.getInstance();
+	@Override
+	public void dispose() {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	protected void performAction(IAction action) {
+		try {
+			// To open a dialog for server addition
+			ServerAdditionDialog dialog = new ServerAdditionDialog(getShell());
+			dialog.open();
+		} catch (Exception e) {
+			logger.error("Error in Manual server addition", e);
+			e.printStackTrace();
+		}
+	}
+
+}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StartVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StartVolumeAction.java
index d7c6d2e3..10ce69c9 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StartVolumeAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StartVolumeAction.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,17 +26,14 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.osgi.internal.signedcontent.Base64;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.AlertsManager;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Alert.ALERT_TYPES;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
 public class StartVolumeAction extends AbstractMonitoredActionDelegate {
 	//private Volume volume;
@@ -57,7 +54,6 @@ public class StartVolumeAction extends AbstractMonitoredActionDelegate {
 		}
 		
 		VolumesClient vc = new VolumesClient();
-		Volume newVolume = new Volume();
 		List<String> startedVolumes = new ArrayList<String>();
 		List<String> failedVolumes = new ArrayList<String>();
 		String errorMessage = "";
@@ -91,6 +87,7 @@ public class StartVolumeAction extends AbstractMonitoredActionDelegate {
 			try {
 				monitor.setTaskName("Starting volume [" + volume.getName() + "]");
 				vc.startVolume(volume.getName(), false);
+				modelManager.updateVolumeStatus(volume, VOLUME_STATUS.ONLINE);
 				startedVolumes.add(volume.getName());
 			} catch (Exception e) {
 				failedVolumes.add(volume.getName());
@@ -100,10 +97,10 @@ public class StartVolumeAction extends AbstractMonitoredActionDelegate {
 				}
 				errorMessage += e.getMessage() + CoreConstants.NEWLINE;
 			}
+			
 			// Update the model by fetching latest volume info (NOT JUST STATUS)
 			try {
-				newVolume = vc.getVolume(volume.getName());
-				modelManager.volumeChanged(volume, newVolume);
+				modelManager.refreshVolumeData(volume);
 			} catch (Exception e) {
 				errorMessage += "Updating volume info failed on UI. [" + e.getMessage() + "]";
 			}
@@ -113,10 +110,10 @@ public class StartVolumeAction extends AbstractMonitoredActionDelegate {
 
 		// Display the success or failure info
 		if (startedVolumes.size() == 0) { // No volume(s) started successfully
-			showErrorDialog(actionDesc, "Following volumes " + failedVolumes + " could not be started!"
+			showErrorDialog(actionDesc, "Volume(s) " + failedVolumes + " could not be started!"
 					+ CoreConstants.NEWLINE + "Error: [" + errorMessage + "]");
 		} else {
-			String info = "Volumes " + startedVolumes + " started successfully!";
+			String info = "Volume(s) " + startedVolumes + " started successfully!";
 			if (!errorMessage.equals("")) {
 				info += CoreConstants.NEWLINE + CoreConstants.NEWLINE + "Volumes " + failedVolumes
 						+ " failed to start! [" + errorMessage + "]";
diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StopTaskAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StopTaskAction.java
new file mode 100644
index 00000000..1a387414
--- /dev/null
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StopTaskAction.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.actions;
+
+import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.viewers.ISelection;
+import org.gluster.storage.management.client.TasksClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+
+
+public class StopTaskAction extends AbstractActionDelegate {
+	private TaskInfo taskInfo;
+	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
+
+	@Override
+	protected void performAction(final IAction action) {
+		final String actionDesc = action.getDescription();
+
+		try {
+			new TasksClient().stopTask(taskInfo.getName());
+			// On successful stop clear from the task list
+			modelManager.removeTask(taskInfo);
+			action.setEnabled(false); // TODO disable other task buttons
+		} catch (Exception e) {
+			showErrorDialog(actionDesc,
+					"Task [" + taskInfo.getDescription() + "] could not be Stopped! Error: [" + e.getMessage() + "]");
+		}
+	}
+
+	@Override
+	public void selectionChanged(IAction action, ISelection selection) {
+		super.selectionChanged(action, selection);
+		action.setEnabled(false);
+		if (selectedEntity instanceof TaskInfo) {
+			taskInfo = (TaskInfo) selectedEntity;
+			action.setEnabled(taskInfo.getStopSupported()
+					&& (taskInfo.getStatus().getCode() == Status.STATUS_CODE_PAUSE
+							|| taskInfo.getStatus().getCode() == Status.STATUS_CODE_RUNNING || taskInfo.getStatus()
+							.getCode() == Status.STATUS_CODE_ERROR));
+		}
+	}
+
+	@Override
+	public void dispose() {
+	}
+
+}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopVolumeAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StopVolumeAction.java
index bbc0be47..cd5d3caf 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/StopVolumeAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/StopVolumeAction.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,14 +26,14 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
 public class StopVolumeAction extends AbstractMonitoredActionDelegate {
 	private GlusterDataModelManager modelManager = GlusterDataModelManager.getInstance();
@@ -42,15 +42,14 @@ public class StopVolumeAction extends AbstractMonitoredActionDelegate {
 	private List<String> onlineVolumeNames = new ArrayList<String>();
 	private List<String> stoppedVolumes  = new ArrayList<String>();
 	private List<Volume> failedVolumes = new ArrayList<Volume>();
+	private String errorMessage = null;
 	
 	@Override
 	protected void performAction(final IAction action, IProgressMonitor monitor) {
-		final String actionDesc = action.getDescription();
-
 		collectVolumeNames();
 
 		if (onlineVolumeNames.size() == 0) {
-			showWarningDialog(actionDesc, "Volumes " + selectedVolumeNames + " already stopped!");
+			showWarningDialog(action.getDescription(), "Volumes " + selectedVolumeNames + " already stopped!");
 			return; // Volumes already stopped, Don't do anything.
 		}
 
@@ -78,51 +77,66 @@ public class StopVolumeAction extends AbstractMonitoredActionDelegate {
 			}
 		}
 		
-		String errorMessage = stopVolume(selectedVolumes, false, monitor);
+		stopVolumes(selectedVolumes, false, monitor);
 		
-		// Display the success or failure info
+		// Check for errors, trying to force stop in case of errors
+		checkForErrors(action, monitor, true);
+	}
+
+	private void checkForErrors(final IAction action, IProgressMonitor monitor, boolean tryForceStop) {
+		String message = null;
 		if (stoppedVolumes.size() == 0) { // No volume(s) stopped successfully
-			String message = "Volume(s) " + failedVolumes + " could not be stopped! " + CoreConstants.NEWLINE
+			message = "Volume(s) " + failedVolumes + " could not be stopped! " + CoreConstants.NEWLINE
 					+ "Error: [" + errorMessage + "]";
-			errorMessage = forceStopVolume(actionDesc, message, monitor);
-			if (errorMessage.isEmpty()) {
+			if(tryForceStop) {
+				forceStopVolumes(action.getDescription(), message + CoreConstants.NEWLINE
+						+ "Do you want to stop forcefully?", monitor);
+				// check for errors without trying to force stop in case of errors
+				checkForErrors(action, monitor, false);
+				return;
+			} else {
+				showErrorDialog(action.getDescription(), message);
 				return;
 			}
-			showErrorDialog(actionDesc, errorMessage);
 		} else {
-			String info = "Volume(s) " + stoppedVolumes + " stopped successfully!";
-			if (!errorMessage.equals("")) {
+			message = "Volume(s) " + stoppedVolumes + " stopped successfully!";
+			if (!errorMessage.isEmpty()) {
 				if (failedVolumes.size() > 0) { 
-					String message = info + CoreConstants.NEWLINE + CoreConstants.NEWLINE + "Volume(s) " + failedVolumes
-							+ " failed to stop! [" + errorMessage + "]";
-					info += forceStopVolume(actionDesc, message, monitor);
+					message = message + CoreConstants.NEWLINE + CoreConstants.NEWLINE + "Volume(s) "
+							+ failedVolumes + " could not be stopped! [" + errorMessage + "]";
+					if(tryForceStop) {
+						forceStopVolumes(action.getDescription(), message + CoreConstants.NEWLINE
+								+ "Do you want to stop forcefully?", monitor);
+						// check for errors without trying to force stop in case of errors
+						checkForErrors(action, monitor, false);
+						return;
+					}
 				} else { // Stop volume success, but post stop volume fails, append the error message
-					info += CoreConstants.NEWLINE + CoreConstants.NEWLINE + errorMessage;
+					message += CoreConstants.NEWLINE + CoreConstants.NEWLINE + errorMessage;
 				}
 			}
-			if (stoppedVolumes.size() == selectedVolumes.size()) {
-				showInfoDialog(actionDesc, info);
+			
+			if (errorMessage.isEmpty()) {
+				showInfoDialog(action.getDescription(), message);
 			} else {
-				showWarningDialog(actionDesc, info);
+				showWarningDialog(action.getDescription(), message);
 			}
 		}
 	}
 	
-	private String forceStopVolume(String actionDesc,  String message, IProgressMonitor monitor) {
-		boolean forceStop = showConfirmDialog(actionDesc,
-				message + CoreConstants.NEWLINE + "Do you want to stop forcefully?");
+	private void forceStopVolumes(String actionDesc,  String message, IProgressMonitor monitor) {
+		boolean forceStop = showConfirmDialog(actionDesc, message);
 		if (!forceStop) {
-			return "";
+			return;
 		}
-		return stopVolume(failedVolumes, true, monitor);
+		stopVolumes(failedVolumes, true, monitor);
 	}
 
-	private String stopVolume(List<Volume> volumes, Boolean force, IProgressMonitor monitor) {
+	private void stopVolumes(List<Volume> volumes, Boolean force, IProgressMonitor monitor) {
 		VolumesClient vc = new VolumesClient();
-		Volume newVolume = new Volume();
 		stoppedVolumes.clear();
 		failedVolumes.clear();
-		String errorMessage = "";
+		errorMessage = "";
 
 		monitor.beginTask("Stopping Selected Volumes...", volumes.size());
 		// Stopping of a volume results in changes to the model, and ultimately updates the "selectedVolumes" list,
@@ -140,8 +154,8 @@ public class StopVolumeAction extends AbstractMonitoredActionDelegate {
 			try {
 				monitor.setTaskName("Stopping volume [" + volume.getName() + "]");
 				vc.stopVolume(volume.getName(), force);
-				// modelManager.updateVolumeStatus(volume, VOLUME_STATUS.OFFLINE);
 				stoppedVolumes.add(volume.getName());
+				modelManager.updateVolumeStatus(volume, VOLUME_STATUS.OFFLINE);
 			} catch (Exception e) {
 				// If any post volume stop activity failed, update the volume status
 				if (vc.getVolume(volume.getName()).getStatus() == VOLUME_STATUS.OFFLINE) {
@@ -154,20 +168,17 @@ public class StopVolumeAction extends AbstractMonitoredActionDelegate {
 					failedVolumes.add(volume);
 					errorMessage += "[" + volume.getName() + "] : " + e.getMessage() + CoreConstants.NEWLINE;
 				}
-				
 			}
 
 			// Update the model by fetching latest volume info (NOT JUST STATUS)
 			try {
-				newVolume = vc.getVolume(volume.getName());
-				modelManager.volumeChanged(volume, newVolume);
+				modelManager.refreshVolumeData(volume);
 			} catch (Exception e) {
 				errorMessage += "Failed to update volume info on UI. [" + e.getMessage() + "]";
 			}
 			monitor.worked(1);
 		}
 		monitor.done();
-		return errorMessage;
 	}
 
 	private void collectVolumeNames() {
@@ -189,7 +200,7 @@ public class StopVolumeAction extends AbstractMonitoredActionDelegate {
 	 * (non-Javadoc)
 	 * 
 	 * @see
-	 * com.gluster.storage.management.console.actions.AbstractActionDelegate#selectionChanged(org.eclipse.jface.action.IAction
+	 * org.gluster.storage.management.console.actions.AbstractActionDelegate#selectionChanged(org.eclipse.jface.action.IAction
 	 * , org.eclipse.jface.viewers.ISelection)
 	 */
 	@Override
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/SupportAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/SupportAction.java
index 5d0bc833..00970c8b 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/SupportAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/SupportAction.java
@@ -1,26 +1,26 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
+import org.gluster.storage.management.console.dialogs.GlusterSupportDialog;
 
-import com.gluster.storage.management.console.dialogs.GlusterSupportDialog;
 
 /**
  *
@@ -28,7 +28,7 @@ import com.gluster.storage.management.console.dialogs.GlusterSupportDialog;
 public class SupportAction extends AbstractActionDelegate {
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.actions.AbstractActionDelegate#performAction(org.eclipse.jface.action.IAction)
+	 * @see org.gluster.storage.management.console.actions.AbstractActionDelegate#performAction(org.eclipse.jface.action.IAction)
 	 */
 	@Override
 	protected void performAction(IAction action) {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/TerminalAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/TerminalAction.java
index 992cc11b..5f65611e 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/TerminalAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/TerminalAction.java
@@ -1,26 +1,26 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
+import org.gluster.storage.management.console.utils.GUIHelper;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
 
 /**
  *
@@ -35,7 +35,7 @@ public class TerminalAction extends AbstractActionDelegate {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.actions.AbstractActionDelegate#performAction(org.eclipse.jface.action.IAction)
+	 * @see org.gluster.storage.management.console.actions.AbstractActionDelegate#performAction(org.eclipse.jface.action.IAction)
 	 */
 	@Override
 	protected void performAction(IAction action) {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/TestPopupMenuAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/TestPopupMenuAction.java
index 0cf32adf..6fcf7d48 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/TestPopupMenuAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/TestPopupMenuAction.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.actions;
+package org.gluster.storage.management.console.actions;
 
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.dialogs.MessageDialog;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/VolumeLogRotateAction.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/VolumeLogRotateAction.java
index 4c538be4..15bc99f0 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/actions/VolumeLogRotateAction.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/actions/VolumeLogRotateAction.java
@@ -1,4 +1,22 @@
-package com.gluster.storage.management.console.actions;
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.actions;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -6,13 +24,13 @@ import java.util.Set;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.ui.IWorkbenchPart;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.VolumeBricksView;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.VolumeBricksView;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
 
 
 public class VolumeLogRotateAction extends AbstractActionDelegate {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/AddBrickPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/AddBrickPage.java
index b2cb3582..9c87a580 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/AddBrickPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/AddBrickPage.java
@@ -1,24 +1,22 @@
-/**
- * AddDiskPage.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.dialogs;
+ *******************************************************************************/
+package org.gluster.storage.management.console.dialogs;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -28,12 +26,12 @@ import java.util.Set;
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
 import com.richclientgui.toolbox.duallists.DualListComposite.ListContentChangedListener;
 import com.richclientgui.toolbox.duallists.IRemovableContentProvider;
 
@@ -43,7 +41,6 @@ import com.richclientgui.toolbox.duallists.IRemovableContentProvider;
  */
 public class AddBrickPage extends WizardPage {
 	private List<Device> availableDevices = new ArrayList<Device>();
-	private List<Device> selectedDevices = new ArrayList<Device>();
 	private Volume volume = null;
 	private BricksSelectionPage page = null;
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/AddBrickWizard.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/AddBrickWizard.java
index 734dd5e4..e2918721 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/AddBrickWizard.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/AddBrickWizard.java
@@ -1,36 +1,34 @@
-/**
- * AddDiskWizard.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.dialogs;
+ *******************************************************************************/
+package org.gluster.storage.management.console.dialogs;
 
 import java.util.HashSet;
 import java.util.Set;
 
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.Wizard;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.utils.StringUtil;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.utils.StringUtil;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/BricksSelectionPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/BricksSelectionPage.java
index 1e4de2ef..68e784d5 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/BricksSelectionPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/BricksSelectionPage.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -36,16 +36,15 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Text;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.TableLabelProviderAdapter;
+import org.gluster.storage.management.console.utils.EntityViewerFilter;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Brick.BRICK_STATUS;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.TableLabelProviderAdapter;
-import com.gluster.storage.management.console.utils.EntityViewerFilter;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Brick.BRICK_STATUS;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.utils.NumberUtil;
 import com.richclientgui.toolbox.duallists.CustomTableDualListComposite;
 import com.richclientgui.toolbox.duallists.DualListComposite.ListContentChangedListener;
 import com.richclientgui.toolbox.duallists.IRemovableContentProvider;
@@ -106,15 +105,6 @@ public class BricksSelectionPage extends Composite {
 		};
 	}
 
-	private int indexOf(List<Disk> disks, Disk searchDisk) {
-		for (Disk disk : disks) {
-			if (disk.getQualifiedName().equals(searchDisk.getQualifiedName())) {
-				return disks.indexOf(disk);
-			}
-		}
-		return -1;
-	}
-
 	private void createPage(List<Device> allDevice, List<Device> selectedDevice, String volumeName) {
 		setupPageLayout();
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ChangePasswordDialog.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/ChangePasswordDialog.java
index 1576ffe3..60386b75 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ChangePasswordDialog.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/ChangePasswordDialog.java
@@ -1,24 +1,22 @@
-/**
- * ChangePasswordDialog.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.dialogs;
+ *******************************************************************************/
+package org.gluster.storage.management.console.dialogs;
 
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.UpdateValueStrategy;
@@ -45,12 +43,12 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.gluster.storage.management.client.UsersClient;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.validators.StringRequiredValidator;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.ConnectionDetails;
 
-import com.gluster.storage.management.client.UsersClient;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.validators.StringRequiredValidator;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.ConnectionDetails;
 
 public class ChangePasswordDialog extends Dialog {
 	public static final int RETURN_CODE_ERROR = 2;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ClusterSelectionDialog.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/ClusterSelectionDialog.java
index cbbcbd46..4a8ff50a 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ClusterSelectionDialog.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/ClusterSelectionDialog.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.util.List;
 
@@ -43,11 +43,11 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.gluster.storage.management.console.Activator;
+import org.gluster.storage.management.console.ConsoleConstants;
+import org.gluster.storage.management.console.preferences.PreferenceConstants;
+import org.gluster.storage.management.console.utils.GUIHelper;
 
-import com.gluster.storage.management.console.Activator;
-import com.gluster.storage.management.console.ConsoleConstants;
-import com.gluster.storage.management.console.preferences.PreferenceConstants;
-import com.gluster.storage.management.console.utils.GUIHelper;
 
 /**
  * Cluster selection dialog, which prompts for the cluster name to be managed
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumePage1.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/CreateVolumePage1.java
index d7d98d24..022ae6dc 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumePage1.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/CreateVolumePage1.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -47,16 +47,16 @@ import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Link;
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Text;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Brick.BRICK_STATUS;
+import org.gluster.storage.management.core.model.Volume.NAS_PROTOCOL;
+import org.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+import org.gluster.storage.management.core.utils.ValidationUtil;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Brick.BRICK_STATUS;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.NAS_PROTOCOL;
-import com.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
-import com.gluster.storage.management.core.utils.ValidationUtil;
 
 public class CreateVolumePage1 extends WizardPage {
 	public static final String PAGE_NAME = "create.volume.page.1";
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumeWizard.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/CreateVolumeWizard.java
index 1558749c..49e57304 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/CreateVolumeWizard.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/CreateVolumeWizard.java
@@ -1,37 +1,37 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.util.List;
 
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.Wizard;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.utils.GlusterLogger;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.utils.GlusterLogger;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
 
 public class CreateVolumeWizard extends Wizard {
 	private static final String title = "Gluster Management Console - Create Volume";
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/GlusterSupportDialog.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/GlusterSupportDialog.java
index a2659650..bd9ceb04 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/GlusterSupportDialog.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/GlusterSupportDialog.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -36,15 +36,14 @@ import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.widgets.FormText;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
+import org.gluster.storage.management.console.utils.GUIHelper;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
 
 public class GlusterSupportDialog extends FormDialog {
 
 	private final GUIHelper guiHelper = GUIHelper.getInstance();
 	private FormToolkit toolkit;
 	private ScrolledForm form;
-	private Composite parent;
 	
 	public GlusterSupportDialog(Shell shell) {
 		super(shell);
@@ -53,7 +52,6 @@ public class GlusterSupportDialog extends FormDialog {
 	@Override
 	protected void configureShell(Shell newShell) {
 		super.configureShell(newShell);
-		this.parent = newShell;
 		newShell.setText("Gluster Management Console - Support Information");
 	}
 	
diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/InitDiskDialog.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/InitDiskDialog.java
new file mode 100644
index 00000000..4ff9235f
--- /dev/null
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/InitDiskDialog.java
@@ -0,0 +1,209 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.dialogs;
+
+import java.util.List;
+
+import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.TraverseEvent;
+import org.eclipse.swt.events.TraverseListener;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Combo;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.swt.widgets.Text;
+import org.eclipse.ui.forms.events.HyperlinkAdapter;
+import org.eclipse.ui.forms.events.HyperlinkEvent;
+import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.gluster.storage.management.console.utils.GUIHelper;
+
+
+public class InitDiskDialog extends Dialog  {
+	
+	private Combo formatTypeCombo = null;
+	private final GUIHelper guiHelper = GUIHelper.getInstance();
+	private Composite initializeDiskTypeComposite;
+	private Composite composite;
+	private String fsType;
+	private String mountPoint;
+	private Text mountPointText;
+	private String deviceName;
+	private List<String> fsTypes; 
+    private static final String DEFAULT_MOUNT_POINT = "/export/";
+
+	public InitDiskDialog(Shell parentShell, String deviceName, List<String> fsTypes) {
+		super(parentShell);
+		this.fsTypes = fsTypes;
+		this.deviceName = deviceName;
+	}
+	
+	@Override
+	protected void configureShell(Shell newShell) {
+		super.configureShell(newShell);
+
+		newShell.setText("Gluster Management Console - Select File System Type");
+		addEscapeListener(newShell);
+	}
+	
+	private void addEscapeListener(Shell shell) {
+		shell.addTraverseListener(new TraverseListener() {
+
+			@Override
+			public void keyTraversed(TraverseEvent e) {
+				if (e.keyCode == SWT.ESC) {
+					cancelPressed();
+				}
+			}
+		});
+	}
+	
+	@Override
+	protected Control createDialogArea(Composite parent) {
+		// Makes sure that child composites inherit the same background
+		parent.setBackgroundMode(SWT.INHERIT_FORCE); 
+		
+		composite =  (Composite) super.createDialogArea(parent);
+		configureDialogLayout(composite);
+		createComposite(composite);
+		return composite;
+	}
+	
+	private void configureDialogLayout(Composite composite) {
+		GridLayout layout = (GridLayout) composite.getLayout();
+		layout.numColumns = 3;
+		layout.marginLeft = 20;
+		layout.marginRight = 20;
+		layout.marginTop = 20;
+		layout.horizontalSpacing = 20;
+		layout.verticalSpacing = 20;
+	}
+	
+	private void createComposite(Composite composite) {
+		initializeDiskTypeComposite = new Composite(composite, SWT.NONE);
+		GridLayout layout = new GridLayout(3, false);
+		initializeDiskTypeComposite.setLayout(layout);
+
+		createLabel(initializeDiskTypeComposite, "File system ");
+		createFormatTypeCombo(initializeDiskTypeComposite);
+		createLabel(initializeDiskTypeComposite, "Mount point ");
+		createMountPointText(initializeDiskTypeComposite);
+		createChangeLink(initializeDiskTypeComposite);
+	}
+	
+	private void createLabel(Composite composite, String labelText) {
+		Label formatTypeLabel = new Label(composite, SWT.NONE);
+		formatTypeLabel.setText(labelText);
+		formatTypeLabel.setLayoutData(new GridData(GridData.BEGINNING, GridData.CENTER, false, false));
+	}
+	
+	private void createFormatTypeCombo(Composite composite) {
+		formatTypeCombo = new Combo(composite, SWT.READ_ONLY);
+		formatTypeCombo.setItems(fsTypes.toArray(new String[0]));
+		formatTypeCombo.select(0);
+		new Label(composite, SWT.NONE);
+	}
+	
+	private void createMountPointText(Composite container) {
+		mountPointText = new Text(container, SWT.BORDER);
+		GridData txtNameData = new GridData(SWT.LEFT, SWT.CENTER, true, false, 1, 1);
+		txtNameData.widthHint = 400;
+		mountPointText.setTextLimit(100);
+		mountPointText.setLayoutData(txtNameData);
+		mountPointText.setText(DEFAULT_MOUNT_POINT + deviceName);
+		mountPointText.setEnabled(false);
+		mountPointText.addModifyListener(new ModifyListener() {
+			@Override
+			public void modifyText(ModifyEvent e) {
+				validateMountPoint();
+			}
+		});
+	}
+	
+	private void createChangeLink(Composite container) {
+		final Hyperlink changeLink = new Hyperlink(container, SWT.UNDERLINE_SINGLE);
+		changeLink.setText("change");
+		changeLink.setUnderlined(true);
+		changeLink.setForeground(new Color(Display.getDefault(), 0, 0, 255));
+		
+		changeLink.addHyperlinkListener(new HyperlinkAdapter() {
+			@Override
+			public void linkActivated(HyperlinkEvent e) {
+				if (!mountPointText.isEnabled()) {
+					changeLink.setVisible(false);
+					mountPointText.setEnabled(true);
+				}
+			}
+		});
+	}
+
+	@Override
+	protected void okPressed() {
+		fsType = formatTypeCombo.getText().trim();
+		mountPoint = mountPointText.getText().trim();
+		if (validateForm()) {
+			super.okPressed();
+		} else {
+			MessageDialog.openError(getShell(), "Initialize Disk - Error", "Please enter a valid mount point"); 
+		}
+	}
+	
+	@Override
+	public void cancelPressed() {
+		super.cancelPressed();
+	}
+	
+	private boolean validateMountPoint() {
+		String mountPoint = mountPointText.getText().trim();
+		if (mountPoint.isEmpty()) {
+			return false;
+		}
+		return mountPoint.matches("^/.+");
+	}
+
+	private boolean validateForm() {
+		return (!formatTypeCombo.getText().trim().isEmpty() && validateMountPoint());
+	}
+
+	/**
+	 * Overriding to make sure that the dialog is centered in screen
+	 */
+	@Override
+	protected void initializeBounds() {
+		super.initializeBounds();
+
+		guiHelper.centerShellInScreen(getShell());
+	}
+	
+	public String getFSType() {
+		return fsType;
+	}
+
+	public String getMountPoint() {
+		return mountPoint;
+	}
+}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/LoginDialog.java
index 6120f5e3..5f2b9bb8 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/LoginDialog.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/LoginDialog.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.lang.reflect.InvocationTargetException;
 
@@ -47,19 +47,19 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.gluster.storage.management.client.ClustersClient;
+import org.gluster.storage.management.client.UsersClient;
+import org.gluster.storage.management.console.Activator;
+import org.gluster.storage.management.console.ConsoleConstants;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.dialogs.ClusterSelectionDialog.CLUSTER_MODE;
+import org.gluster.storage.management.console.preferences.PreferenceConstants;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.validators.StringRequiredValidator;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.ConnectionDetails;
 
-import com.gluster.storage.management.client.ClustersClient;
-import com.gluster.storage.management.client.UsersClient;
-import com.gluster.storage.management.console.Activator;
-import com.gluster.storage.management.console.ConsoleConstants;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.dialogs.ClusterSelectionDialog.CLUSTER_MODE;
-import com.gluster.storage.management.console.preferences.PreferenceConstants;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.validators.StringRequiredValidator;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.ConnectionDetails;
 
 /**
  * Login dialog, which prompts for the user's account info, and has Login and Cancel buttons.
@@ -272,7 +272,6 @@ public class LoginDialog extends Dialog {
 
 		// If the password is default, Let user to change the password
 		if (password.equalsIgnoreCase(CoreConstants.DEFAULT_PASSWORD)) {
-			String oldSecurityTokeString = GlusterDataModelManager.getInstance().getSecurityToken();
 			ChangePasswordDialog dialog = new ChangePasswordDialog(getShell());
 
 			if (dialog.open() == Dialog.CANCEL) {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickPage1.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickPage1.java
index e3d9d2bf..7e473fc2 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickPage1.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickPage1.java
@@ -1,25 +1,23 @@
-/**
- * MigrateBrickPage1.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
+ *******************************************************************************/
 
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.util.List;
 
@@ -43,14 +41,14 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.TableItem;
 import org.eclipse.swt.widgets.Text;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.TableLabelProviderAdapter;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.TableLabelProviderAdapter;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.utils.NumberUtil;
 
 public class MigrateBrickPage1 extends WizardPage {
 	private static final String PAGE_NAME = "migrate.disk.page.1";
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickWizard.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickWizard.java
index 589b065f..51d5e1d0 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/MigrateBrickWizard.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/MigrateBrickWizard.java
@@ -1,38 +1,38 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.net.URI;
 
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.wizard.Wizard;
+import org.gluster.storage.management.client.TasksClient;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.client.TasksClient;
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Cluster;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.core.model.Volume;
 
 public class MigrateBrickWizard extends Wizard {
 	private Volume volume;
@@ -64,7 +64,7 @@ public class MigrateBrickWizard extends Wizard {
 		String dialogTitle = "Brick migration";
 
 		try {
-			String reference = volume.getName() + "-" + sourceDir + "-" + targetDir;
+			String reference = volume.getName() + "#" + sourceDir + "#" + targetDir;
 			TaskInfo existingTaskInfo = GlusterDataModelManager.getInstance().getTaskByReference(reference);
 			if (existingTaskInfo != null && existingTaskInfo.getStatus().getCode() != Status.STATUS_CODE_SUCCESS
 					&& existingTaskInfo.getStatus().getCode() != Status.STATUS_CODE_FAILURE) {
@@ -95,7 +95,12 @@ public class MigrateBrickWizard extends Wizard {
 					return true;
 				}
 			} 
-			MessageDialog.openInformation(getShell(), dialogTitle, "Brick migration started successfully");
+			if (taskInfo.getStatus().getCode() == TaskStatus.STATUS_CODE_RUNNING) {
+				MessageDialog.openInformation(getShell(), dialogTitle, "Brick migration started successfully");
+			} else {
+				MessageDialog.openWarning(getShell(), dialogTitle,
+						"Brick migration started, but following error occured: " + taskInfo.getStatus());
+			}
 			GUIHelper.getInstance().showTaskView();
 			
 		} catch (Exception e) {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/SelectDisksDialog.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/SelectDisksDialog.java
index 42c5e782..b5515262 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/SelectDisksDialog.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/SelectDisksDialog.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.dialogs;
+package org.gluster.storage.management.console.dialogs;
 
 import java.util.List;
 import java.util.Set;
@@ -31,9 +31,9 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Shell;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Device;
 
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Device;
 
 public class SelectDisksDialog extends Dialog {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ServerAdditionDialog.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/ServerAdditionDialog.java
index 9781f348..388f6603 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/dialogs/ServerAdditionDialog.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/dialogs/ServerAdditionDialog.java
@@ -1,24 +1,22 @@
-/**
- * ServerAdditionDialog.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.dialogs;
+ *******************************************************************************/
+package org.gluster.storage.management.console.dialogs;
 
 import java.net.URI;
 import java.util.List;
@@ -40,11 +38,11 @@ import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
+import org.gluster.storage.management.client.GlusterServersClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.GlusterServer;
 
-import com.gluster.storage.management.client.GlusterServersClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.GlusterServer;
 
 public class ServerAdditionDialog extends Dialog {
 	public static final int RETURN_CODE_ERROR = 2;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/jobs/DataSyncJob.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/jobs/DataSyncJob.java
index 907d7b84..8be50e97 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/jobs/DataSyncJob.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/jobs/DataSyncJob.java
@@ -1,38 +1,36 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.jobs;
+package org.gluster.storage.management.console.jobs;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.widgets.Display;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.core.model.GlusterDataModel;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GlusterLogger;
-import com.gluster.storage.management.core.model.GlusterDataModel;
 
 /**
  *
  */
 public class DataSyncJob extends Job {
-	private static final GlusterLogger logger = GlusterLogger.getInstance();
 
 	public DataSyncJob(String name) {
 		super(name);
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/AlertsPreferencePage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/AlertsPreferencePage.java
index be8513fc..9b7fcbf0 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/AlertsPreferencePage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/AlertsPreferencePage.java
@@ -1,11 +1,29 @@
-package com.gluster.storage.management.console.preferences;
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.preferences;
 
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.IntegerFieldEditor;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.gluster.storage.management.console.Activator;
 
-import com.gluster.storage.management.console.Activator;
 
 public class AlertsPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/ChartsPreferencePage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/ChartsPreferencePage.java
index 8eeb84ab..c3bbd370 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/ChartsPreferencePage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/ChartsPreferencePage.java
@@ -1,29 +1,29 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.preferences;
+package org.gluster.storage.management.console.preferences;
 
 import org.eclipse.jface.preference.ComboFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.gluster.storage.management.console.Activator;
 
-import com.gluster.storage.management.console.Activator;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/GlusterPreferencePage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/GlusterPreferencePage.java
index 2fc8de0e..793b152b 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/GlusterPreferencePage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/GlusterPreferencePage.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.preferences;
+package org.gluster.storage.management.console.preferences;
 
 import java.util.List;
 
@@ -26,9 +26,9 @@ import org.eclipse.jface.preference.FieldEditorPreferencePage;
 import org.eclipse.jface.preference.IntegerFieldEditor;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferencePage;
+import org.gluster.storage.management.client.ClustersClient;
+import org.gluster.storage.management.console.Activator;
 
-import com.gluster.storage.management.client.ClustersClient;
-import com.gluster.storage.management.console.Activator;
 
 /**
  * This class represents a preference page that
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/PreferenceConstants.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/PreferenceConstants.java
index 650ae1a9..b31ef2fb 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/PreferenceConstants.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/PreferenceConstants.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.preferences;
+package org.gluster.storage.management.console.preferences;
 
 /**
  * Constant definitions for plug-in preferences
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/PreferenceInitializer.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/PreferenceInitializer.java
index 72e62447..f525a52c 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/preferences/PreferenceInitializer.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/preferences/PreferenceInitializer.java
@@ -1,27 +1,27 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.preferences;
+package org.gluster.storage.management.console.preferences;
 
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.jface.preference.IPreferenceStore;
+import org.gluster.storage.management.console.Activator;
 
-import com.gluster.storage.management.console.Activator;
 
 /**
  * Class used to initialize default preference values.
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/toolbar/GlusterToolbarManager.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/toolbar/GlusterToolbarManager.java
index ebd1db07..c462e5b7 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/toolbar/GlusterToolbarManager.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/toolbar/GlusterToolbarManager.java
@@ -1,37 +1,37 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.toolbar;
+package org.gluster.storage.management.console.toolbar;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
+import org.gluster.storage.management.console.actions.ActionConstants;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.actions.ActionConstants;
-import com.gluster.storage.management.core.model.Cluster;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.Volume;
 
 public class GlusterToolbarManager implements ToolbarManager {
 	private enum ENTITY_TYPE {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/toolbar/ToolbarManager.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/toolbar/ToolbarManager.java
index 8dc14ffd..a755739b 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/toolbar/ToolbarManager.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/toolbar/ToolbarManager.java
@@ -1,24 +1,24 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.toolbar;
+package org.gluster.storage.management.console.toolbar;
 
-import com.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.Entity;
 
 /**
  * Whenever the current selection/action demands changes to the toolbar, the toolbar manager is used to update the
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/ChartUtil.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/ChartUtil.java
index 57121f5b..52cfdca1 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/ChartUtil.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/ChartUtil.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.utils;
+package org.gluster.storage.management.console.utils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,15 +34,15 @@ import org.eclipse.ui.forms.events.HyperlinkAdapter;
 import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.gluster.storage.management.console.Activator;
+import org.gluster.storage.management.console.preferences.PreferenceConstants;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.NetworkInterface;
+import org.gluster.storage.management.core.model.ServerStats;
+import org.gluster.storage.management.core.model.ServerStatsRow;
 
-import com.gluster.storage.management.console.Activator;
-import com.gluster.storage.management.console.preferences.PreferenceConstants;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.NetworkInterface;
-import com.gluster.storage.management.core.model.ServerStats;
-import com.gluster.storage.management.core.model.ServerStatsRow;
 import com.ibm.icu.util.Calendar;
 
 /**
@@ -201,7 +201,6 @@ public class ChartUtil {
 		@Override
 		public void linkActivated(HyperlinkEvent e) {
 			super.linkActivated(e);
-			Composite section = ((Hyperlink) e.getSource()).getParent().getParent();
 			updatePreference(serverName);
 		}
 
@@ -222,7 +221,6 @@ public class ChartUtil {
 
 		@Override
 		protected void updatePreference(String serverName) {
-			ServerStats stats;
 			if (serverName == null) {
 				preferenceStore.setValue(PreferenceConstants.P_CPU_AGGREGATED_CHART_PERIOD, statsPeriod);
 			} else {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/ChartViewerComposite.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/ChartViewerComposite.java
index 9e67ed29..bbea8bd9 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/ChartViewerComposite.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/ChartViewerComposite.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.utils;
+package org.gluster.storage.management.console.utils;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/EntityViewerFilter.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/EntityViewerFilter.java
index 60161324..980c0c89 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/EntityViewerFilter.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/EntityViewerFilter.java
@@ -1,30 +1,30 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.utils;
+package org.gluster.storage.management.console.utils;
 
 import java.util.Map.Entry;
 
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerFilter;
+import org.gluster.storage.management.core.model.Filterable;
+import org.gluster.storage.management.core.utils.StringUtil;
 
-import com.gluster.storage.management.core.model.Filterable;
-import com.gluster.storage.management.core.utils.StringUtil;
 
 public class EntityViewerFilter extends ViewerFilter {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GUIHelper.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/GUIHelper.java
index b8f8d83e..e88d10f8 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GUIHelper.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/GUIHelper.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.utils;
+package org.gluster.storage.management.console.utils;
 
 import java.util.Arrays;
 import java.util.HashSet;
@@ -75,16 +75,16 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.forms.widgets.Section;
 import org.eclipse.ui.progress.IProgressConstants;
+import org.gluster.storage.management.console.Application;
+import org.gluster.storage.management.console.ConsoleConstants;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.views.NavigationView;
+import org.gluster.storage.management.console.views.TasksView;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.utils.JavaUtil;
 
-import com.gluster.storage.management.console.Application;
-import com.gluster.storage.management.console.ConsoleConstants;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.views.NavigationView;
-import com.gluster.storage.management.console.views.TasksView;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.utils.JavaUtil;
 
 public class GUIHelper {
 	private static final GUIHelper instance = new GUIHelper();
@@ -415,7 +415,6 @@ public class GUIHelper {
 		
 		tableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
 			
-			@SuppressWarnings("unchecked")
 			@Override
 			public void selectionChanged(SelectionChangedEvent event) {
 				List<Object> checkedElements = Arrays.asList(tableViewer.getCheckedElements());
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GlusterChartPalette.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/GlusterChartPalette.java
index 3c5b0b62..f6bc80f6 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GlusterChartPalette.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/GlusterChartPalette.java
@@ -1,15 +1,23 @@
-/***********************************************************************
- * Copyright (c) 2004 Actuate Corporation.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
  *
- * Contributors:
- * Actuate Corporation - initial API and implementation
- ***********************************************************************/
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
 
-package com.gluster.storage.management.console.utils;
+package org.gluster.storage.management.console.utils;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -81,7 +89,7 @@ public class GlusterChartPalette extends EObjectImpl implements Palette
 
 	private static ILogger logger = Logger.getLogger( "org.eclipse.birt.chart.engine/model.attribute.impl" ); //$NON-NLS-1$
 
-	private static List colorLib = new ArrayList( 32 );
+	private static List<ColorDefinition> colorLib = new ArrayList<ColorDefinition>( 32 );
 	static
 	{
 		colorLib.add( ColorDefinitionImpl.create ( 0, 1, 252) );
@@ -303,7 +311,7 @@ public class GlusterChartPalette extends EObjectImpl implements Palette
 	 * @param lst
 	 * @param pos
 	 */
-	private static final void shiftList( final List lst, int pos )
+	private static final void shiftList( final List<ColorDefinition> lst, int pos )
 	{
 		int size = lst.size( );
 
@@ -322,7 +330,7 @@ public class GlusterChartPalette extends EObjectImpl implements Palette
 			return;
 		}
 
-		Object[] array = lst.toArray( );
+		ColorDefinition[] array = lst.toArray(new ColorDefinition[0]);
 
 		lst.clear( );
 
@@ -344,13 +352,13 @@ public class GlusterChartPalette extends EObjectImpl implements Palette
 	 */
 	public final void update( int iIndex )
 	{
-		final EList el = getEntries( );
+		final EList<Fill> el = getEntries( );
 		el.clear( );
 		if ( iIndex < 0 )
 		{
 			// a rotation version of palette-0, rataion pos is the negatvie
 			// index.
-			ArrayList al = new ArrayList( );
+			ArrayList<ColorDefinition> al = new ArrayList<ColorDefinition>( );
 
 			al.add( ColorDefinitionImpl.create( 80, 166, 218 ) );
 			al.add( ColorDefinitionImpl.create( 242, 88, 106 ) );
@@ -406,7 +414,7 @@ public class GlusterChartPalette extends EObjectImpl implements Palette
 	 */
 	public final void update( Fill f )
 	{
-		final EList el = getEntries( );
+		final EList<Fill> el = getEntries( );
 		el.clear( );
 		el.add( f );
 	}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GlusterLogger.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/GlusterLogger.java
index b633678a..c69ec539 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/GlusterLogger.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/GlusterLogger.java
@@ -1,27 +1,27 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.utils;
+package org.gluster.storage.management.console.utils;
 
 import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.Status;
+import org.gluster.storage.management.console.Activator;
 
-import com.gluster.storage.management.console.Activator;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/ImageUtil.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/ImageUtil.java
index d278704b..39e0ae34 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/ImageUtil.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/ImageUtil.java
@@ -1,31 +1,29 @@
-/**
- * ImageUtil.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.utils;
+ *******************************************************************************/
+package org.gluster.storage.management.console.utils;
 
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.gluster.storage.management.console.Application;
+import org.gluster.storage.management.core.utils.LRUCache;
 
-import com.gluster.storage.management.console.Application;
-import com.gluster.storage.management.core.utils.LRUCache;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/TableViewerComparator.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/TableViewerComparator.java
index 7e11cc6f..b6cd8e54 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/utils/TableViewerComparator.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/utils/TableViewerComparator.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.utils;
+package org.gluster.storage.management.console.utils;
 
 import org.eclipse.jface.viewers.Viewer;
 import org.eclipse.jface.viewers.ViewerComparator;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/validators/StringRequiredValidator.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/validators/StringRequiredValidator.java
index cac65829..7a914348 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/validators/StringRequiredValidator.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/validators/StringRequiredValidator.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.validators;
+package org.gluster.storage.management.console.validators;
 
 import org.eclipse.core.databinding.validation.IValidator;
 import org.eclipse.core.databinding.validation.ValidationStatus;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ClusterAdapterFactory.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/ClusterAdapterFactory.java
index d904c8f3..7afdde1c 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ClusterAdapterFactory.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/ClusterAdapterFactory.java
@@ -1,37 +1,37 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.ui.model.IWorkbenchAdapter;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.gluster.storage.management.console.Application;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.GlusterDataModel;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.Application;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.core.model.Cluster;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.GlusterDataModel;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.model.Volume;
 
 public class ClusterAdapterFactory implements IAdapterFactory {
 	private IWorkbenchAdapter entityAdapter = new IWorkbenchAdapter() {
@@ -46,7 +46,7 @@ public class ClusterAdapterFactory implements IAdapterFactory {
 			return ((Entity)o).getName();
 		}
 
-		@SuppressWarnings({ "unchecked", "rawtypes" })
+		@SuppressWarnings("rawtypes")
 		@Override
 		public ImageDescriptor getImageDescriptor(Object object) {
 			String iconPath = null;
@@ -82,7 +82,6 @@ public class ClusterAdapterFactory implements IAdapterFactory {
 		}
 	};
 
-	@SuppressWarnings("rawtypes")
 	@Override
 	public Object getAdapter(Object adaptableObject, Class adapterType) {
 		if (adapterType == IWorkbenchAdapter.class) {
@@ -93,7 +92,6 @@ public class ClusterAdapterFactory implements IAdapterFactory {
 		return null;
 	}
 
-	@SuppressWarnings("rawtypes")
 	@Override
 	public Class[] getAdapterList() {
 		return new Class[] { IWorkbenchAdapter.class };
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ClusterSummaryView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/ClusterSummaryView.java
index 6be9f8d9..85086e6f 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/ClusterSummaryView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/ClusterSummaryView.java
@@ -1,24 +1,22 @@
-/**
- * DiscoveredServerView.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.views;
+ *******************************************************************************/
+package org.gluster.storage.management.console.views;
 
 import java.util.List;
 
@@ -41,30 +39,30 @@ import org.eclipse.ui.forms.widgets.ImageHyperlink;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.handlers.IHandlerService;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.Activator;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.actions.ActionConstants;
+import org.gluster.storage.management.console.preferences.PreferenceConstants;
+import org.gluster.storage.management.console.utils.ChartUtil;
+import org.gluster.storage.management.console.utils.ChartViewerComposite;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.utils.ChartUtil.ChartPeriodLinkListener;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.model.Alert;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.GlusterDataModel;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.ServerStats;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
 
-import com.gluster.storage.management.console.Activator;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.actions.ActionConstants;
-import com.gluster.storage.management.console.preferences.PreferenceConstants;
-import com.gluster.storage.management.console.utils.ChartUtil;
-import com.gluster.storage.management.console.utils.ChartUtil.ChartPeriodLinkListener;
-import com.gluster.storage.management.console.utils.ChartViewerComposite;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.model.Alert;
-import com.gluster.storage.management.core.model.Cluster;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.GlusterDataModel;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.model.ServerStats;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
 
 /**
  * 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DiscoveredServerView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/DiscoveredServerView.java
index abc9ec2f..aba4d127 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DiscoveredServerView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/DiscoveredServerView.java
@@ -1,24 +1,22 @@
-/**
- * DiscoveredServerView.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.views;
+ *******************************************************************************/
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
@@ -26,10 +24,10 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.utils.NumberUtil;
 
 /**
  * @author root
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DiscoveredServersView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/DiscoveredServersView.java
index ab3cd556..2c5856f1 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/DiscoveredServersView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/DiscoveredServersView.java
@@ -1,36 +1,34 @@
-/**
- * DiscoveredServersView.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.views;
+ *******************************************************************************/
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.ServersPage;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.Server;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.ServersPage;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.Server;
 
 /**
  *
diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/DisksView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/DisksView.java
new file mode 100644
index 00000000..6e840c01
--- /dev/null
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/DisksView.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.views;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.DisksPage;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.GlusterServer;
+
+
+public class DisksView extends ViewPart {
+	public static final String ID = DisksView.class.getName();
+	private static final GUIHelper guiHelper = GUIHelper.getInstance();
+	private EntityGroup<GlusterServer> servers;
+	private DisksPage page;
+
+	@Override
+	public void createPartControl(Composite parent) {
+		if (servers == null) {
+			servers = guiHelper.getSelectedEntity(getSite(), EntityGroup.class);
+		}
+		
+		page = new DisksPage(parent, SWT.NONE, getSite(), getAllDisks(servers));
+		//page.layout(); // IMP: lays out the form properly
+	}
+
+	private List<Disk> getAllDisks(EntityGroup<GlusterServer> servers) {
+		List<Disk> disks = new ArrayList<Disk>();
+		for(GlusterServer server : servers.getEntities()) {
+			disks.addAll(server.getDisks());
+		}
+		return disks;
+	}
+
+	@Override
+	public void setFocus() {
+		page.setFocus();
+	}
+}
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerDisksView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServerDisksView.java
index d3cd98e8..e996a82b 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerDisksView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServerDisksView.java
@@ -1,37 +1,35 @@
-/**
- * GlusterServerDisksView.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.views;
+ *******************************************************************************/
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.ServerDisksPage;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Event.EVENT_TYPE;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.ServerDisksPage;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.Event.EVENT_TYPE;
-import com.gluster.storage.management.core.model.GlusterServer;
 
 public class GlusterServerDisksView extends ViewPart {
 	public static final String ID = GlusterServerDisksView.class.getName();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerLogsView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServerLogsView.java
index 33c85be2..65a52d28 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerLogsView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServerLogsView.java
@@ -1,32 +1,30 @@
-/**
- * GlusterServerLogsView.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.views;
+ *******************************************************************************/
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.ServerLogsPage;
+import org.gluster.storage.management.core.model.GlusterServer;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.ServerLogsPage;
-import com.gluster.storage.management.core.model.GlusterServer;
 
 public class GlusterServerLogsView extends ViewPart {
 	public static final String ID = GlusterServerLogsView.class.getName();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerSummaryView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServerSummaryView.java
index 08344f84..f76999e7 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServerSummaryView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServerSummaryView.java
@@ -1,30 +1,27 @@
-/**
- * GlusterServerSummaryView.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.views;
+ *******************************************************************************/
+package org.gluster.storage.management.console.views;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.eclipse.birt.chart.util.CDateTime;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.dialogs.ProgressMonitorDialog;
@@ -41,7 +38,6 @@ import org.eclipse.swt.custom.CLabel;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.layout.FillLayout;
 import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
@@ -49,33 +45,29 @@ import org.eclipse.swt.widgets.ProgressBar;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.client.GlusterServersClient;
+import org.gluster.storage.management.console.Activator;
+import org.gluster.storage.management.console.ConsoleConstants;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.NetworkInterfaceTableLabelProvider;
+import org.gluster.storage.management.console.preferences.PreferenceConstants;
+import org.gluster.storage.management.console.toolbar.GlusterToolbarManager;
+import org.gluster.storage.management.console.utils.ChartUtil;
+import org.gluster.storage.management.console.utils.ChartUtil.ChartPeriodLinkListener;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.utils.GlusterLogger;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.Event.EVENT_TYPE;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.model.ServerStats;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.client.GlusterServersClient;
-import com.gluster.storage.management.console.Activator;
-import com.gluster.storage.management.console.ConsoleConstants;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.NetworkInterfaceTableLabelProvider;
-import com.gluster.storage.management.console.preferences.PreferenceConstants;
-import com.gluster.storage.management.console.toolbar.GlusterToolbarManager;
-import com.gluster.storage.management.console.utils.ChartUtil;
-import com.gluster.storage.management.console.utils.ChartUtil.ChartPeriodLinkListener;
-import com.gluster.storage.management.console.utils.ChartViewerComposite;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.utils.GlusterLogger;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.Event.EVENT_TYPE;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.model.ServerStats;
-import com.gluster.storage.management.core.model.ServerStatsRow;
-import com.gluster.storage.management.core.utils.NumberUtil;
-import com.ibm.icu.util.Calendar;
 import com.richclientgui.toolbox.gauges.CoolGauge;
 
 public class GlusterServerSummaryView extends ViewPart {
@@ -85,8 +77,6 @@ public class GlusterServerSummaryView extends ViewPart {
 	private ScrolledForm form;
 	private GlusterServer server;
 	private ClusterListener clusterListener;
-	private static final int CHART_WIDTH = 350;
-	private static final int CHART_HEIGHT = 250;
 	private static final GlusterLogger logger = GlusterLogger.getInstance();
 	private static final IPreferenceStore preferenceStore = Activator.getDefault().getPreferenceStore();
 
@@ -207,49 +197,6 @@ public class GlusterServerSummaryView extends ViewPart {
 		preferenceStore.removePropertyChangeListener(propertyChangeListener);
 	}
 
-	private void createAreaChart(Composite section, Calendar timestamps[], Double values[], String unit) {
-		ChartViewerComposite chartViewerComposite = new ChartViewerComposite(section, SWT.NONE, timestamps, values, unit, "HH:mm", 100);
-		GridData data = new GridData(SWT.FILL, SWT.FILL, false, false);
-		data.widthHint = CHART_WIDTH;
-		data.heightHint = CHART_HEIGHT;
-		chartViewerComposite.setLayoutData(data);
-	}
-
-	private void extractChartData(ServerStats stats, List<Calendar> timestamps, List<Double> data, int dataColumnIndex) {
-		for(ServerStatsRow row : stats.getRows()) {
-			Double cpuUsage = row.getUsageData().get(dataColumnIndex);
-			if(!cpuUsage.isNaN()) {
-				timestamps.add(new CDateTime(row.getTimestamp() * 1000));
-				data.add(cpuUsage);
-			}
-		}
-	}
-
-	private void createAreaChartSection(ServerStats stats, String sectionTitle, int dataColumnIndex, String unit) {
-		List<Calendar> timestamps = new ArrayList<Calendar>();
-		List<Double> data = new ArrayList<Double>();
-		extractChartData(stats, timestamps, data, dataColumnIndex);
-		
-		if(timestamps.size() == 0) {
-			// Log a message saying no CPU stats available
-			return;
-		}
-
-		Composite section = guiHelper.createSection(form, toolkit, sectionTitle, null, 1, false);
-		createAreaChart(section, timestamps.toArray(new Calendar[0]), data.toArray(new Double[0]), unit);
-
-//		Calendar[] timestamps = new Calendar[] { new CDateTime(1000l*1310468100), new CDateTime(1000l*1310468400), new CDateTime(1000l*1310468700),
-//				new CDateTime(1000l*1310469000), new CDateTime(1000l*1310469300), new CDateTime(1000l*1310469600), new CDateTime(1000l*1310469900),
-//				new CDateTime(1000l*1310470200), new CDateTime(1000l*1310470500), new CDateTime(1000l*1310470800), new CDateTime(1000l*1310471100),
-//				new CDateTime(1000l*1310471400), new CDateTime(1000l*1310471700), new CDateTime(1000l*1310472000), new CDateTime(1000l*1310472300),
-//				new CDateTime(1000l*1310472600), new CDateTime(1000l*1310472900), new CDateTime(1000l*1310473200), new CDateTime(1000l*1310473500),
-//				new CDateTime(1000l*1310473800) };
-//		
-//		Double[] values = new Double[] { 10d, 11.23d, 17.92d, 18.69d, 78.62d, 89.11d, 92.43d, 89.31d, 57.39d, 18.46d, 10.44d, 16.28d, 13.51d, 17.53d, 12.21, 20d, 21.43d, 16.45d, 14.86d, 15.27d };
-//		createLineChart(section, timestamps, values, "%");
-		createChartLinks(section, 4);
-	}
-	
 	private void createMemoryUsageSection() {
 		String memStatsPeriod = preferenceStore.getString(PreferenceConstants.P_MEM_CHART_PERIOD);
 		memoryUsageSection = guiHelper.createSection(form, toolkit, "Memory Usage", null, 1, false);
@@ -311,25 +258,6 @@ public class GlusterServerSummaryView extends ViewPart {
 				networkChartPeriodLinkListener , -1, 5);
 	}
 	
-	private Composite createChartLinks(Composite section, int columnCount) {
-		GridLayout layout = new org.eclipse.swt.layout.GridLayout(columnCount, false);
-		layout.marginBottom = 0;
-		layout.marginTop = 0;
-		layout.marginLeft = (CHART_WIDTH - (50*columnCount)) / 2;
-		Composite graphComposite = toolkit.createComposite(section, SWT.NONE);
-		graphComposite.setLayout(layout);
-		GridData data = new GridData(SWT.FILL, SWT.FILL, false, false);
-		data.widthHint = CHART_WIDTH;
-		graphComposite.setLayoutData(data);
-		
-		Label label1 = toolkit.createLabel(graphComposite, "1 day");
-		Hyperlink link1 = toolkit.createHyperlink(graphComposite, "1 week", SWT.NONE);
-		Hyperlink link2 = toolkit.createHyperlink(graphComposite, "1 month", SWT.NONE);
-		Hyperlink link3 = toolkit.createHyperlink(graphComposite, "1 year", SWT.NONE);
-		
-		return graphComposite;
-	}
-
 	private void createSections(Composite parent) {
 		String serverName = server.getName();
 		form = guiHelper.setupForm(parent, toolkit, "Server Summary [" + serverName + "]");
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServersSummaryView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServersSummaryView.java
index afca5ad5..6d923a6b 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServersSummaryView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServersSummaryView.java
@@ -1,24 +1,22 @@
-/**
- * GlusterServersSummaryView.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.views;
+ *******************************************************************************/
+package org.gluster.storage.management.console.views;
 
 import java.util.List;
 
@@ -31,23 +29,23 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.utils.ChartViewerComposite;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.Alert;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.Alert.ALERT_TYPES;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.utils.ChartViewerComposite;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.Alert;
-import com.gluster.storage.management.core.model.Alert.ALERT_TYPES;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
 
 /**
  *
@@ -66,7 +64,6 @@ public class GlusterServersSummaryView extends ViewPart {
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
 	 */
-	@SuppressWarnings("unchecked")
 	@Override
 	public void createPartControl(Composite parent) {
 		if (servers == null) {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServersView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServersView.java
index 66017990..0104ce9c 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterServersView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterServersView.java
@@ -1,24 +1,22 @@
-/**
- * GlusterServersView.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.views;
+ *******************************************************************************/
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
@@ -26,12 +24,12 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.GlusterServersPage;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.GlusterServer;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.GlusterServersPage;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.GlusterServer;
 
 /**
  * @author root
@@ -46,7 +44,6 @@ public class GlusterServersView extends ViewPart implements IDoubleClickListener
 	/* (non-Javadoc)
 	 * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
 	 */
-	@SuppressWarnings("unchecked")
 	@Override
 	public void createPartControl(Composite parent) {
 		if (servers == null) {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterViewsManager.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterViewsManager.java
index 05c30626..ba1ba8df 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/GlusterViewsManager.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/GlusterViewsManager.java
@@ -1,36 +1,34 @@
-/**
- * GlusterViewsManager.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.views;
+ *******************************************************************************/
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.ui.IViewReference;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.PartInitException;
+import org.gluster.storage.management.console.ConsoleConstants;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.ConsoleConstants;
-import com.gluster.storage.management.core.model.Cluster;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.model.Volume;
 
 /**
  * @see ViewsManager
@@ -43,7 +41,7 @@ public class GlusterViewsManager implements ViewsManager {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.views.ViewsManager#updateViews(com.gluster.storage.management.core.model.Entity)
+	 * @see org.gluster.storage.management.console.views.ViewsManager#updateViews(org.gluster.storage.management.core.model.Entity)
 	 */
 	@SuppressWarnings("rawtypes")
 	@Override
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/NavigationTreeLabelDecorator.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/NavigationTreeLabelDecorator.java
index d7448e76..2768b3f5 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/NavigationTreeLabelDecorator.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/NavigationTreeLabelDecorator.java
@@ -1,34 +1,34 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.jface.viewers.IDecoration;
 import org.eclipse.jface.viewers.ILabelProviderListener;
 import org.eclipse.jface.viewers.ILightweightLabelDecorator;
 import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.gluster.storage.management.console.Application;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.Application;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.model.Volume;
 
 public class NavigationTreeLabelDecorator implements ILightweightLabelDecorator {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/NavigationView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/NavigationView.java
index 21fc4c7a..cbadfcfc 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/NavigationView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/NavigationView.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views;
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.core.runtime.IAdapterFactory;
 import org.eclipse.core.runtime.Platform;
@@ -33,15 +33,15 @@ import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.model.BaseWorkbenchContentProvider;
 import org.eclipse.ui.model.WorkbenchLabelProvider;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.toolbar.GlusterToolbarManager;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.GlusterDataModel;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.toolbar.GlusterToolbarManager;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.GlusterDataModel;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Volume;
 
 public class NavigationView extends ViewPart implements ISelectionListener {
 	public static final String ID = NavigationView.class.getName();
diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/TasksView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/TasksView.java
new file mode 100644
index 00000000..fd98c48b
--- /dev/null
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/TasksView.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.views;
+
+import java.util.List;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.views.pages.TasksPage;
+import org.gluster.storage.management.core.model.TaskInfo;
+
+
+public class TasksView extends ViewPart {
+	
+	public static final String ID = TasksView.class.getName();
+	private TasksPage page;
+	
+
+	public TasksView() {
+		// TODO Auto-generated constructor stub
+	}
+
+	@Override
+	public void createPartControl(Composite parent) {
+		page = new TasksPage(getSite(), parent, SWT.NONE, getAllTasks());
+		page.layout(); // IMP: lays out the form properly
+	}
+
+	
+	private List<TaskInfo> getAllTasks() {
+		return GlusterDataModelManager.getInstance().getModel().getCluster().getTaskInfoList();
+	}
+
+	@Override
+	public void setFocus() {
+		page.setFocus();
+	}
+
+}
diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/ViewsManager.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/ViewsManager.java
new file mode 100644
index 00000000..ebe58061
--- /dev/null
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/ViewsManager.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.views;
+
+import org.gluster.storage.management.core.model.Entity;
+
+/**
+ * Whenever the current selection/action demands opening different set of views, the views manager is used to open
+ * appropriate views.
+ */
+public interface ViewsManager {
+	/**
+	 * Updates the views for given entity. This typically means that user is working with the given entity, and hence
+	 * the views related to that entity should be made visible, and other un-related views should be hidden.
+	 * 
+	 * @param entity
+	 *            The entity for which views are to be updated
+	 */
+	public void updateViews(Entity entity);
+}
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeBricksView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeBricksView.java
new file mode 100644
index 00000000..c5b0356b
--- /dev/null
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeBricksView.java
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.views;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.BricksPage;
+import org.gluster.storage.management.core.model.Volume;
+
+
+public class VolumeBricksView extends ViewPart {
+	public static final String ID = VolumeBricksView.class.getName();
+	private static final GUIHelper guiHelper = GUIHelper.getInstance();
+	private BricksPage page;
+	private Volume volume;
+
+	@Override
+	public void createPartControl(Composite parent) {
+		if (volume == null) {
+			volume = guiHelper.getSelectedEntity(getSite(), Volume.class);
+		}
+
+		createPage(parent);
+	}
+
+	/**
+	 * @param parent
+	 */
+	private void createPage(Composite parent) {
+		page = new BricksPage(parent, SWT.NONE, getSite(), volume.getBricks());
+		parent.layout(); // IMP: lays out the form properly
+	}
+
+	@Override
+	public void setFocus() {
+		page.setFocus();
+	}
+}
+
diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeLogsView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeLogsView.java
new file mode 100644
index 00000000..23c714e5
--- /dev/null
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeLogsView.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.views;
+
+import org.eclipse.jface.dialogs.MessageDialog;
+import org.eclipse.jface.viewers.DoubleClickEvent;
+import org.eclipse.jface.viewers.IDoubleClickListener;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.VolumeLogsPage;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.VolumeLogMessage;
+import org.gluster.storage.management.core.utils.DateUtil;
+
+
+public class VolumeLogsView extends ViewPart implements IDoubleClickListener {
+	VolumeLogsPage logsPage;
+	public static final String ID = VolumeLogsView.class.getName();
+	private static final GUIHelper guiHelper = GUIHelper.getInstance();
+	private Volume volume;
+
+	@Override
+	public void createPartControl(Composite parent) {
+		if (volume == null) {
+			volume = guiHelper.getSelectedEntity(getSite(), Volume.class);
+		}
+
+		createPage(parent);
+	}
+
+	private void createPage(Composite parent) {
+		logsPage = new VolumeLogsPage(parent, SWT.NONE, volume);
+		logsPage.addDoubleClickListener(this);
+		
+		parent.layout(); // IMP: lays out the form properly
+	}
+
+	@Override
+	public void setFocus() {
+		logsPage.setFocus();
+	}
+	
+	@Override
+	public void doubleClick(DoubleClickEvent event) {
+		VolumeLogMessage volumeLogMessage = (VolumeLogMessage) ((StructuredSelection) event.getSelection())
+				.getFirstElement();
+		String message = DateUtil.formatDate(volumeLogMessage.getTimestamp()) + " "
+				+ DateUtil.formatTime(volumeLogMessage.getTimestamp()) + " [" + volumeLogMessage.getSeverity() + "]"
+				+ CoreConstants.NEWLINE + CoreConstants.NEWLINE + volumeLogMessage.getMessage();
+
+		new MessageDialog(getSite().getShell(), "Log message from " + volumeLogMessage.getBrick(), null, message,
+				MessageDialog.NONE, new String[] { "Close" }, 0).open();
+
+	}
+}
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeOptionsView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeOptionsView.java
new file mode 100644
index 00000000..3abdf617
--- /dev/null
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeOptionsView.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.views;
+
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.VolumeOptionsPage;
+import org.gluster.storage.management.core.model.Volume;
+
+
+public class VolumeOptionsView extends ViewPart {
+	public static final String ID = VolumeOptionsView.class.getName();
+	private static final GUIHelper guiHelper = GUIHelper.getInstance();
+	private VolumeOptionsPage page;
+	private Volume volume;
+
+	@Override
+	public void createPartControl(Composite parent) {
+		if (volume == null) {
+			volume = guiHelper.getSelectedEntity(getSite(), Volume.class);
+		}
+
+		createPage(parent);
+	}
+
+	private void createPage(Composite parent) {
+		page = new VolumeOptionsPage(parent, SWT.NONE, volume);
+		parent.layout(); // IMP: lays out the form properly
+	}
+
+	@Override
+	public void setFocus() {
+		page.setFocus();
+	}
+}
+
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeSummaryView.java
index 78c7caf2..151a44e8 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeSummaryView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeSummaryView.java
@@ -1,4 +1,22 @@
-package com.gluster.storage.management.console.views;
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.console.views;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -33,29 +51,29 @@ import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Hyperlink;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.toolbar.GlusterToolbarManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.model.Alert;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Partition;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+import org.gluster.storage.management.core.utils.NumberUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.utils.ValidationUtil;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.toolbar.GlusterToolbarManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.model.Alert;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Cluster;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Partition;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
-import com.gluster.storage.management.core.utils.NumberUtil;
-import com.gluster.storage.management.core.utils.StringUtil;
-import com.gluster.storage.management.core.utils.ValidationUtil;
 
 public class VolumeSummaryView extends ViewPart {
 	public static final String ID = VolumeSummaryView.class.getName();
@@ -780,12 +798,6 @@ public class VolumeSummaryView extends ViewPart {
 		lblStatusValue.redraw();
 	}
 
-	private void createTransportTypeField(Composite section) {
-		toolkit.createLabel(section, "Transport Type: ", SWT.NONE);
-		toolkit.createLabel(section, "" + volume.getTransportTypeStr(), SWT.NONE);
-		toolkit.createLabel(section, "", SWT.NONE); // dummy
-	}
-
 	private void createNumOfBricksField(Composite section) {
 		toolkit.createLabel(section, "Number of Bricks: ", SWT.NONE);
 		numberOfBricks = toolkit.createLabel(section, "" + volume.getNumOfBricks(), SWT.NONE);
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeView.java
index ced9335b..da5fc461 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumeView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumeView.java
@@ -1,24 +1,22 @@
-/**
- * DiscoveredServerView.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.views;
+ *******************************************************************************/
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
@@ -26,10 +24,10 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.utils.NumberUtil;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.utils.NumberUtil;
 
 /**
  * @author root
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumesSummaryView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumesSummaryView.java
index cd937215..9581600b 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumesSummaryView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumesSummaryView.java
@@ -1,24 +1,22 @@
-/**
- * VolumesSummaryView.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.views;
+ *******************************************************************************/
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CLabel;
@@ -29,23 +27,23 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.ScrolledForm;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IImageKeys;
+import org.gluster.storage.management.console.utils.ChartViewerComposite;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.Alert;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IImageKeys;
-import com.gluster.storage.management.console.utils.ChartViewerComposite;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.Alert;
-import com.gluster.storage.management.core.model.Cluster;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
 
 /**
  * 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumesView.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumesView.java
index 4deeace2..d734e439 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/VolumesView.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/VolumesView.java
@@ -1,36 +1,34 @@
-/**
- * DiscoveredServersView.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.views;
+ *******************************************************************************/
+package org.gluster.storage.management.console.views;
 
 import org.eclipse.jface.viewers.DoubleClickEvent;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.views.pages.VolumesPage;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.views.pages.VolumesPage;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.Volume;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/AbstractDisksPage.java
index 417e67ea..6f1fb744 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractDisksPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/AbstractDisksPage.java
@@ -1,24 +1,25 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jface.dialogs.MessageDialog;
@@ -38,27 +39,30 @@ import org.eclipse.ui.IWorkbenchSite;
 import org.eclipse.ui.forms.events.HyperlinkAdapter;
 import org.eclipse.ui.forms.events.HyperlinkEvent;
 import org.eclipse.ui.forms.widgets.ImageHyperlink;
+import org.gluster.storage.management.client.GlusterServersClient;
+import org.gluster.storage.management.client.TasksClient;
+import org.gluster.storage.management.console.Application;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.IEntityListener;
+import org.gluster.storage.management.console.dialogs.InitDiskDialog;
+import org.gluster.storage.management.console.utils.GlusterLogger;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.Device;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.Device.DEVICE_STATUS;
+import org.gluster.storage.management.core.model.Event.EVENT_TYPE;
 
-import com.gluster.storage.management.client.GlusterServersClient;
-import com.gluster.storage.management.client.TasksClient;
-import com.gluster.storage.management.console.Application;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.IEntityListener;
-import com.gluster.storage.management.console.dialogs.InitializeDiskTypeSelection;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.Device;
-import com.gluster.storage.management.core.model.Device.DEVICE_STATUS;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.Event.EVENT_TYPE;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
 
 public abstract class AbstractDisksPage extends AbstractTableTreeViewerPage<Disk> implements IEntityListener {
 	protected List<Disk> disks;
+	protected static final GlusterLogger logger = GlusterLogger.getInstance();
 	
 	/**
 	 * @return Index of the "status" column in the table. Return -1 if status column is not displayed
@@ -69,7 +73,7 @@ public abstract class AbstractDisksPage extends AbstractTableTreeViewerPage<Disk
 		super(site, parent, style, false, true, disks);
 		this.disks = disks;
 		
-		// creates hyperlinks for "unitialized" disks
+		// creates hyperlinks for "uninitialized" disks
 		setupStatusCellEditor(); 
 		// Listen for disk status change events
 		Application.getApplication().addEntityListener(this);
@@ -250,22 +254,31 @@ public abstract class AbstractDisksPage extends AbstractTableTreeViewerPage<Disk
 			TaskInfo existingTaskInfo = modelManager.getTaskByReference(reference);
 			if (existingTaskInfo != null && existingTaskInfo.getStatus().getCode() != Status.STATUS_CODE_SUCCESS
 					&& existingTaskInfo.getStatus().getCode() != Status.STATUS_CODE_FAILURE) {
-				MessageDialog.openInformation(getShell(), "Error: Initialize disk", "Initializing disk [" + reference
+				MessageDialog.openInformation(getShell(), "Initialize disk - Error", "Initializing disk [" + reference
 						+ "] is already in progress! Try later.");
 				return;
 			}
 			
-			InitializeDiskTypeSelection formatDialog = new InitializeDiskTypeSelection(getShell());
+			// To collect the available fsType
+			GlusterServersClient serversClient = new GlusterServersClient();
+			List<String> fsTypes = new ArrayList<String>();
+			try {
+				fsTypes = serversClient.getFSTypes(device.getServerName());
+			} catch (GlusterRuntimeException e1) {
+				MessageDialog.openError(getShell(), "Initialize disk - Error", e1.getMessage());
+				return;
+			}
+
+			InitDiskDialog formatDialog = new InitDiskDialog(getShell(), device.getName(), fsTypes);
 			int userAction = formatDialog.open();
 			if (userAction == Window.CANCEL) {
-				formatDialog.cancelPressed();
+				// formatDialog.cancelPressed();
 				return;
 			}
 
-			GlusterServersClient serversClient = new GlusterServersClient();
 			try {
 				
-				URI uri = serversClient.initializeDisk(device.getServerName(), device.getName(), formatDialog.getFSType());
+				URI uri = serversClient.initializeDisk(device.getServerName(), device.getName(), formatDialog.getFSType(), formatDialog.getMountPoint());
 
 				TasksClient taskClient = new TasksClient();
 				TaskInfo taskInfo = taskClient.getTaskInfo(uri);
@@ -285,11 +298,12 @@ public abstract class AbstractDisksPage extends AbstractTableTreeViewerPage<Disk
 					// GlusterDataModelManager.getInstance().updateDeviceStatus(device.getServerName(), device.getName(),
 					//		DEVICE_STATUS.INITIALIZED);
 				} else {
-					MessageDialog.openError(getShell(), "Error: Initialize disk", taskInfo.getStatus().getMessage());
+					MessageDialog.openError(getShell(), "Initialize disk - Error", taskInfo.getStatus().getMessage());
 				}
 				guiHelper.showTaskView();
 			} catch (Exception e1) {
-				MessageDialog.openError(getShell(), "Error: Initialize disk", e1.getMessage());
+				logger.error("Exception while initialize disk", e1);
+				MessageDialog.openError(getShell(), "Initialize disk - Error", e1.getMessage());
 			}
 		}
 	}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractTableTreeViewerPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/AbstractTableTreeViewerPage.java
index 7414bbc3..bc8cf9ac 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractTableTreeViewerPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/AbstractTableTreeViewerPage.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -42,11 +42,11 @@ import org.eclipse.ui.ISelectionListener;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchSite;
 import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.Disk;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.Disk;
 
 public abstract class AbstractTableTreeViewerPage<T> extends Composite implements ISelectionListener {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractTableViewerPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/AbstractTableViewerPage.java
index c80740f3..258042b9 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/AbstractTableViewerPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/AbstractTableViewerPage.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -50,11 +50,11 @@ import org.eclipse.ui.IWorkbenchSite;
 import org.eclipse.ui.forms.events.HyperlinkAdapter;
 import org.eclipse.ui.forms.widgets.FormToolkit;
 import org.eclipse.ui.forms.widgets.Hyperlink;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.console.utils.TableViewerComparator;
+import org.gluster.storage.management.core.model.ClusterListener;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.console.utils.TableViewerComparator;
-import com.gluster.storage.management.core.model.ClusterListener;
 
 public abstract class AbstractTableViewerPage<T> extends Composite implements ISelectionListener {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/BricksPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/BricksPage.java
index 674074c3..a07175a8 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/BricksPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/BricksPage.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.Collection;
 import java.util.List;
@@ -30,13 +30,13 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.ui.IWorkbenchSite;
+import org.gluster.storage.management.console.BrickTableLabelProvider;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.BrickTableLabelProvider;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.Volume;
 
 public class BricksPage extends AbstractTableViewerPage<Brick> {
 	private List<Brick> bricks;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/DiskTreeContentProvider.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/DiskTreeContentProvider.java
index 79b54aa1..e28ac8a6 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/DiskTreeContentProvider.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/DiskTreeContentProvider.java
@@ -1,31 +1,31 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Partition;
 
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Partition;
 
 public class DiskTreeContentProvider implements ITreeContentProvider {
 
@@ -40,6 +40,7 @@ public class DiskTreeContentProvider implements ITreeContentProvider {
 	 * 
 	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
 	 */
+	@SuppressWarnings("unchecked")
 	public Object[] getElements(Object inputElement) {
 		return ((List<Disk>) inputElement).toArray();
 	}
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/DisksPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/DisksPage.java
index 8501bef3..91f3be12 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/DisksPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/DisksPage.java
@@ -1,32 +1,32 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IWorkbenchSite;
+import org.gluster.storage.management.console.DeviceTableLabelProvider;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Entity;
 
-import com.gluster.storage.management.console.DeviceTableLabelProvider;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Entity;
 
 public class DisksPage extends AbstractDisksPage {
 
@@ -34,17 +34,10 @@ public class DisksPage extends AbstractDisksPage {
 		DISK, PARTITION, FREE_SPACE, TOTAL_SPACE, STATUS
 	};
 
-	private static final String[] DISK_TABLE_COLUMN_NAMES = new String[] { "Disk", "Partition", "Free Space (GB)",
-			"Total Space (GB)", "Status" };
-
 	public DisksPage(final Composite parent, int style, IWorkbenchSite site, List<Disk> disks) {
 		super(parent, style, site, disks);
 	}
 
-	private String getDiskTableColumnDesc(DISK_TABLE_COLUMN_INDICES idx) {
-		return DISK_TABLE_COLUMN_NAMES[idx.ordinal()];
-	}
-	
 	@Override
 	protected DeviceTableLabelProvider getLabelProvider() {
 		return new DeviceTableLabelProvider();
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/GlusterServersPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/GlusterServersPage.java
index 3ef05a2a..b82e59bb 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/GlusterServersPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/GlusterServersPage.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -30,16 +30,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.IWorkbenchSite;
+import org.gluster.storage.management.console.EntityGroupContentProvider;
+import org.gluster.storage.management.console.GlusterServerTableLabelProvider;
+import org.gluster.storage.management.console.utils.TableViewerComparator;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.GlusterServer;
 
-import com.gluster.storage.management.console.EntityGroupContentProvider;
-import com.gluster.storage.management.console.GlusterServerTableLabelProvider;
-import com.gluster.storage.management.console.utils.TableViewerComparator;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.GlusterServer;
 
 public class GlusterServersPage extends AbstractTableViewerPage<GlusterServer> {
 	private List<GlusterServer> glusterServers;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionKeyEditingSupport.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/OptionKeyEditingSupport.java
index ed6aea64..013956cd 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionKeyEditingSupport.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/OptionKeyEditingSupport.java
@@ -1,7 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
 /**
  * 
  */
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,12 +30,12 @@ import org.eclipse.jface.viewers.ComboBoxCellEditor;
 import org.eclipse.jface.viewers.EditingSupport;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.VolumeOption;
+import org.gluster.storage.management.core.model.VolumeOptionInfo;
+import org.gluster.storage.management.core.model.VolumeOptions;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.VolumeOption;
-import com.gluster.storage.management.core.model.VolumeOptionInfo;
-import com.gluster.storage.management.core.model.VolumeOptions;
 
 /**
  * Editing support for the "value" column in volume options table viewer.
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionValueEditingSupport.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/OptionValueEditingSupport.java
index faf4fbe6..51a56a7c 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/OptionValueEditingSupport.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/OptionValueEditingSupport.java
@@ -1,7 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
 /**
  * 
  */
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -13,13 +31,13 @@ import org.eclipse.jface.viewers.TextCellEditor;
 import org.eclipse.swt.custom.BusyIndicator;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.VolumeOption;
+import org.gluster.storage.management.core.model.VolumeOptionInfo;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.VolumeOption;
-import com.gluster.storage.management.core.model.VolumeOptionInfo;
 
 /**
  * Editing support for the "value" column in volume options table viewer.
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServerDisksPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServerDisksPage.java
index a2982590..ba9b7152 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServerDisksPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServerDisksPage.java
@@ -1,32 +1,32 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
 import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IWorkbenchSite;
+import org.gluster.storage.management.console.ServerDiskTableLabelProvider;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Entity;
 
-import com.gluster.storage.management.console.ServerDiskTableLabelProvider;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Entity;
 
 public class ServerDisksPage  extends AbstractDisksPage {
 	
@@ -38,8 +38,6 @@ public class ServerDisksPage  extends AbstractDisksPage {
 		DISK, PARTITION, FREE_SPACE, TOTAL_SPACE, STATUS
 	};
 
-	private static final String[] SERVER_DISK_TABLE_COLUMN_NAMES = new String[] { "Disk", "Partition", "Free Space (GB)",
-			"Total Space (GB)", "Status" };
 
 	@Override
 	protected int getStatusColumnIndex() {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServerLogsPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServerLogsPage.java
index 7b3f3946..99238c54 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServerLogsPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServerLogsPage.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ListViewer;
@@ -33,25 +33,22 @@ import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.model.GlusterServer;
 
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.model.GlusterServer;
 
 public class ServerLogsPage extends Composite {
 
 	private final FormToolkit toolkit = new FormToolkit(Display.getCurrent());
 	private final GUIHelper guiHelper = GUIHelper.getInstance();
 	private Text text;
-	private Table table;
 
 	public enum LOG_TABLE_COLUMN_INDICES {
 		DATE, TIME, DISK, SEVERITY, MESSAGE
 	};
 
-	private static final String[] LOG_TABLE_COLUMN_NAMES = new String[] { "Date", "Time", "Disk", "Severity", "Message" };
 
 	/**
 	 * Create the composite.
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServersPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServersPage.java
index d97827c6..b0cbac2b 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/ServersPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/ServersPage.java
@@ -1,22 +1,22 @@
- /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -30,14 +30,14 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.IWorkbenchSite;
+import org.gluster.storage.management.console.EntityGroupContentProvider;
+import org.gluster.storage.management.console.ServerTableLabelProvider;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.Server;
 
-import com.gluster.storage.management.console.EntityGroupContentProvider;
-import com.gluster.storage.management.console.ServerTableLabelProvider;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.Server;
 
 public class ServersPage extends AbstractTableViewerPage<Server> {
 	private List<Server> servers;
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/TasksPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/TasksPage.java
index c166af0f..191b9a57 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/TasksPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/TasksPage.java
@@ -1,24 +1,22 @@
-/**
- * TasksPage.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.console.views.pages;
+ *******************************************************************************/
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -33,13 +31,13 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchSite;
+import org.gluster.storage.management.console.TasksTableLabelProvider;
+import org.gluster.storage.management.console.toolbar.GlusterToolbarManager;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.TaskInfo;
 
-import com.gluster.storage.management.console.TasksTableLabelProvider;
-import com.gluster.storage.management.console.toolbar.GlusterToolbarManager;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.TaskInfo;
 
 public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	private List<TaskInfo> taskInfoList;
@@ -58,7 +56,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#createClusterListener()
+	 * @see org.gluster.storage.management.console.views.pages.AbstractTableViewerPage#createClusterListener()
 	 */
 	@Override
 	protected ClusterListener createClusterListener() {
@@ -89,7 +87,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getColumnNames()
+	 * @see org.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getColumnNames()
 	 */
 	@Override
 	protected String[] getColumnNames() {
@@ -97,7 +95,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#setColumnProperties(org.eclipse.swt.widgets.Table)
+	 * @see org.gluster.storage.management.console.views.pages.AbstractTableViewerPage#setColumnProperties(org.eclipse.swt.widgets.Table)
 	 */
 	@Override
 	protected void setColumnProperties(Table table) {
@@ -106,7 +104,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getLabelProvider()
+	 * @see org.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getLabelProvider()
 	 */
 	@Override
 	protected IBaseLabelProvider getLabelProvider() {
@@ -114,7 +112,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getContentProvider()
+	 * @see org.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getContentProvider()
 	 */
 	@Override
 	protected IContentProvider getContentProvider() {
@@ -122,7 +120,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getAllEntities()
+	 * @see org.gluster.storage.management.console.views.pages.AbstractTableViewerPage#getAllEntities()
 	 */
 	@Override
 	protected List<TaskInfo> getAllEntities() {
@@ -130,7 +128,7 @@ public class TasksPage extends AbstractTableViewerPage<TaskInfo> {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.console.views.pages.AbstractTableViewerPage#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
+	 * @see org.gluster.storage.management.console.views.pages.AbstractTableViewerPage#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
 	 */
 	@Override
 	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumeLogsPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/VolumeLogsPage.java
index e573229c..a6a40561 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumeLogsPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/VolumeLogsPage.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.Calendar;
 import java.util.Date;
@@ -26,6 +26,7 @@ import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.layout.TableColumnLayout;
 import org.eclipse.jface.viewers.ArrayContentProvider;
 import org.eclipse.jface.viewers.ColumnWeightData;
+import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
@@ -47,15 +48,15 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.gluster.storage.management.client.VolumesClient;
+import org.gluster.storage.management.console.VolumeLogTableLabelProvider;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.constants.GlusterConstants.VOLUME_LOG_LEVELS;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.VolumeLogMessage;
 
-import com.gluster.storage.management.client.VolumesClient;
-import com.gluster.storage.management.console.VolumeLogTableLabelProvider;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.constants.GlusterConstants.VOLUME_LOG_LEVELS;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.VolumeLogMessage;
 
 public class VolumeLogsPage extends Composite {
 
@@ -423,4 +424,8 @@ public class VolumeLogsPage extends Composite {
 		calendar.set(Calendar.SECOND, time.getSeconds());
 		return calendar.getTime();
 	}
+	
+	public void addDoubleClickListener(IDoubleClickListener listener) {
+		tableViewer.addDoubleClickListener(listener);
+	}
 }
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumeOptionsPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/VolumeOptionsPage.java
index dd02a672..8bf522ab 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumeOptionsPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/VolumeOptionsPage.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -49,17 +49,17 @@ import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.forms.widgets.FormToolkit;
+import org.gluster.storage.management.console.GlusterDataModelManager;
+import org.gluster.storage.management.console.VolumeOptionsContentProvider;
+import org.gluster.storage.management.console.VolumeOptionsTableLabelProvider;
+import org.gluster.storage.management.console.utils.GUIHelper;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.VolumeOption;
+import org.gluster.storage.management.core.model.VolumeOptionInfo;
 
-import com.gluster.storage.management.console.GlusterDataModelManager;
-import com.gluster.storage.management.console.VolumeOptionsContentProvider;
-import com.gluster.storage.management.console.VolumeOptionsTableLabelProvider;
-import com.gluster.storage.management.console.utils.GUIHelper;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.VolumeOption;
-import com.gluster.storage.management.core.model.VolumeOptionInfo;
 
 public class VolumeOptionsPage extends Composite {
 
diff --git a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumesPage.java b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/VolumesPage.java
index 484f91b0..b65b0f01 100644
--- a/src/com.gluster.storage.management.console/src/com/gluster/storage/management/console/views/pages/VolumesPage.java
+++ b/src/org.gluster.storage.management.console/src/org/gluster/storage/management/console/views/pages/VolumesPage.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.console.views.pages;
+package org.gluster.storage.management.console.views.pages;
 
 import java.util.List;
 
@@ -30,16 +30,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableColumn;
 import org.eclipse.ui.IWorkbenchSite;
+import org.gluster.storage.management.console.EntityGroupContentProvider;
+import org.gluster.storage.management.console.VolumeTableLabelProvider;
+import org.gluster.storage.management.console.toolbar.GlusterToolbarManager;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.model.ClusterListener;
+import org.gluster.storage.management.core.model.DefaultClusterListener;
+import org.gluster.storage.management.core.model.EntityGroup;
+import org.gluster.storage.management.core.model.Event;
+import org.gluster.storage.management.core.model.Volume;
 
-import com.gluster.storage.management.console.EntityGroupContentProvider;
-import com.gluster.storage.management.console.VolumeTableLabelProvider;
-import com.gluster.storage.management.console.toolbar.GlusterToolbarManager;
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.model.ClusterListener;
-import com.gluster.storage.management.core.model.DefaultClusterListener;
-import com.gluster.storage.management.core.model.EntityGroup;
-import com.gluster.storage.management.core.model.Event;
-import com.gluster.storage.management.core.model.Volume;
 
 public class VolumesPage extends AbstractTableViewerPage<Volume> {
 	private List<Volume> volumes;
diff --git a/src/com.gluster.storage.management.core/.classpath b/src/org.gluster.storage.management.core/.classpath
index b41cbcdb..81cdfd54 100644
--- a/src/com.gluster.storage.management.core/.classpath
+++ b/src/org.gluster.storage.management.core/.classpath
@@ -3,7 +3,11 @@
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="junit"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/src/com.gluster.storage.management.core/.project b/src/org.gluster.storage.management.core/.project
index c016cd3c..93338d2e 100644
--- a/src/com.gluster.storage.management.core/.project
+++ b/src/org.gluster.storage.management.core/.project
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.core</name>
+	<name>org.gluster.storage.management.core</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
 		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
 			<arguments>
 			</arguments>
@@ -21,14 +26,16 @@
 			</arguments>
 		</buildCommand>
 		<buildCommand>
-			<name>com.instantiations.assist.eclipse.coverage.instrumentationBuilder</name>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>com.instantiations.assist.eclipse.coverage.codeCoverageNature</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/src/com.gluster.storage.management.core/.settings/org.eclipse.jdt.core.prefs b/src/org.gluster.storage.management.core/.settings/org.eclipse.jdt.core.prefs
index f22cedf1..f22cedf1 100644
--- a/src/com.gluster.storage.management.core/.settings/org.eclipse.jdt.core.prefs
+++ b/src/org.gluster.storage.management.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/src/org.gluster.storage.management.core/.settings/org.eclipse.wst.common.component b/src/org.gluster.storage.management.core/.settings/org.eclipse.wst.common.component
new file mode 100644
index 00000000..efdcd940
--- /dev/null
+++ b/src/org.gluster.storage.management.core/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="org.gluster.storage.management.core">
+        <wb-resource deploy-path="/" source-path="/src"/>
+    </wb-module>
+</project-modules>
diff --git a/src/org.gluster.storage.management.core/.settings/org.eclipse.wst.common.project.facet.core.xml b/src/org.gluster.storage.management.core/.settings/org.eclipse.wst.common.project.facet.core.xml
new file mode 100644
index 00000000..926884d9
--- /dev/null
+++ b/src/org.gluster.storage.management.core/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <fixed facet="jst.utility"/>
+  <fixed facet="java"/>
+  <installed facet="java" version="1.6"/>
+  <installed facet="jst.utility" version="1.0"/>
+</faceted-project>
diff --git a/src/org.gluster.storage.management.core/META-INF/MANIFEST.MF b/src/org.gluster.storage.management.core/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..d1c69a80
--- /dev/null
+++ b/src/org.gluster.storage.management.core/META-INF/MANIFEST.MF
@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Gluster Storage Platform Core
+Bundle-SymbolicName: org.gluster.storage.management.core
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: Gluster
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.gluster.storage.management.core.constants,
+ org.gluster.storage.management.core.exceptions,
+ org.gluster.storage.management.core.model,
+ org.gluster.storage.management.core.response,
+ org.gluster.storage.management.core.utils
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0"
+Bundle-ClassPath: .
+Import-Package: org.gluster.storage.management.core.exceptions
diff --git a/src/org.gluster.storage.management.core/build.properties b/src/org.gluster.storage.management.core/build.properties
new file mode 100644
index 00000000..19ab8727
--- /dev/null
+++ b/src/org.gluster.storage.management.core/build.properties
@@ -0,0 +1,23 @@
+###############################################################################
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Console.
+#
+# Gluster Management Console 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.
+#
+# Gluster Management Console 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/>.
+###############################################################################
+source.. = src/,\
+           junit/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/src/com.gluster.storage.management.core/junit/core.junit.launch b/src/org.gluster.storage.management.core/junit/core.junit.launch
index 0bf6dc30..3d6e7deb 100644
--- a/src/com.gluster.storage.management.core/junit/core.junit.launch
+++ b/src/org.gluster.storage.management.core/junit/core.junit.launch
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/com.gluster.storage.management.core"/>
+<listEntry value="/org.gluster.storage.management.core"/>
 </listAttribute>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="4"/>
 </listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=com.gluster.storage.management.core"/>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=org.gluster.storage.management.core"/>
 <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
 <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
 <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.gluster.storage.management.core"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.gluster.storage.management.core"/>
 </launchConfiguration>
diff --git a/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/AlertTest.java b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/AlertTest.java
new file mode 100644
index 00000000..c013f9ea
--- /dev/null
+++ b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/AlertTest.java
@@ -0,0 +1,101 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.core.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.gluster.storage.management.core.model.Alert;
+import org.gluster.storage.management.core.model.Alert.ALERT_TYPES;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+
+/**
+ * The class <code>AlertTest</code> contains tests for the class <code>{@link Alert}</code>.
+ *
+ * @generatedBy CodePro at 10/17/11 3:32 PM
+ * @author root
+ * @version $Revision: 1.0 $
+ */
+public class AlertTest {
+
+	/**
+	 * Run the void copyFrom(Alert) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/17/11 3:32 PM
+	 */
+	@Test
+	public void testCopyFrom_1()
+		throws Exception {
+		Alert fixture = new Alert(ALERT_TYPES.DISK_USAGE_ALERT, "server1:sda",
+				Alert.ALERT_TYPE_STR[ALERT_TYPES.DISK_USAGE_ALERT.ordinal()] + " [85% used] in disk [server1:sda]");
+		Alert alert = new Alert();
+		alert.copyFrom(fixture);
+
+		assertEquals(fixture.getId(), alert.getId());
+		assertEquals(fixture.getReference(), alert.getReference());
+		assertEquals(fixture.getType(), alert.getType());
+		assertEquals(fixture.getMessage(), alert.getMessage());
+		assertNotNull(alert);
+	}
+
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 10/17/11 3:32 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 10/17/11 3:32 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 10/17/11 3:32 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(AlertTest.class);
+	}
+}
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/BrickTest.java b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/BrickTest.java
new file mode 100644
index 00000000..0b2a208d
--- /dev/null
+++ b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/BrickTest.java
@@ -0,0 +1,323 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.core.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Brick.BRICK_STATUS;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+
+/**
+ * The class <code>BrickTest</code> contains tests for the class <code>{@link Brick}</code>.
+ *
+ * @generatedBy CodePro at 10/17/11 4:39 PM
+ * @author root
+ * @version $Revision: 1.0 $
+ */
+public class BrickTest {
+	/**
+	 * Run the void copyFrom(Brick) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/17/11 4:39 PM
+	 */
+	@Test
+	public void testCopyFrom_1()
+		throws Exception {
+		Brick fixture = new Brick("Server1", BRICK_STATUS.ONLINE, "/sda1/songs");
+		Brick newBrick = new Brick();
+		newBrick.copyFrom(fixture);
+
+		assertEquals(fixture.getServerName(), newBrick.getServerName());
+		assertEquals(fixture.getBrickDirectory(), newBrick.getBrickDirectory());
+		assertEquals(fixture.getStatus(), newBrick.getStatus());
+		assertEquals(fixture.getQualifiedName(), newBrick.getQualifiedName());
+	}
+
+	/**
+	 * Run the boolean equals(Object) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/17/11 4:39 PM
+	 */
+	@Test
+	public void testEquals_1()
+		throws Exception {
+		Brick fixture = new Brick("Server1", BRICK_STATUS.ONLINE, "/sda1/songs");
+		Brick newBrick = new Brick();
+		newBrick.copyFrom(fixture);
+
+		boolean result = fixture.equals(newBrick);
+		assertTrue(result);
+	}
+
+	/**
+	 * Run the boolean equals(Object) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/17/11 4:39 PM
+	 */
+	@Test
+	public void testEquals_2()
+		throws Exception {
+		Brick fixture = new Brick("Server2", BRICK_STATUS.OFFLINE, "/md1/test");
+		Brick newBrick = new Brick();
+		newBrick.copyFrom(fixture);
+
+		boolean result = fixture.equals(newBrick);
+		assertTrue(result);
+	}
+
+	/**
+	 * Run the boolean equals(Object) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/17/11 4:39 PM
+	 */
+	@Test
+	public void testEquals_3()
+		throws Exception {
+		Brick fixture = new Brick("", BRICK_STATUS.ONLINE, "");
+		Brick newBrick = new Brick();
+		newBrick.copyFrom(fixture);
+
+		boolean result = fixture.equals(newBrick);
+		assertTrue(result);
+	}
+
+	
+	/**
+	 * Run the boolean filter(String,boolean) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/17/11 4:39 PM
+	 */
+	@Test
+	public void testFilter_1()
+		throws Exception {
+		Brick fixture = new Brick("Server2", BRICK_STATUS.OFFLINE, "/md1/test");
+
+		String filterString = "Ser";
+		boolean caseSensitive = true;
+
+		boolean result = fixture.filter(filterString, caseSensitive);
+		assertTrue(result);
+	}
+
+	/**
+	 * Run the boolean filter(String,boolean) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/17/11 4:39 PM
+	 */
+	@Test
+	public void testFilter_2()
+		throws Exception {
+		Brick fixture = new Brick("Server2", BRICK_STATUS.OFFLINE, "/md1/test");
+
+		String filterString = "ser";
+		boolean caseSensitive = true;
+
+		boolean result = fixture.filter(filterString, caseSensitive);
+		assertEquals(result, false);
+	}
+
+	/**
+	 * Run the boolean filter(String,boolean) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/17/11 4:39 PM
+	 */
+	@Test
+	public void testFilter_3()
+		throws Exception {
+		Brick fixture = new Brick("Server2", BRICK_STATUS.OFFLINE, "/md1/test");
+
+		String filterString = "Ser";
+		boolean caseSensitive = false;
+
+		boolean result = fixture.filter(filterString, caseSensitive);
+		assertTrue(result);
+	}
+	
+	/**
+	 * Run the boolean filter(String,boolean) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/17/11 4:39 PM
+	 */
+	@Test
+	public void testFilter_4()
+		throws Exception {
+		Brick fixture = new Brick("Server2", BRICK_STATUS.ONLINE, "/md1/test");
+
+		String filterString = "ser";
+		boolean caseSensitive = false;
+
+		boolean result = fixture.filter(filterString, caseSensitive);
+		assertTrue(result);
+	}
+
+	/**
+	 * Run the boolean filter(String,boolean) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/17/11 4:39 PM
+	 */
+	@Test
+	public void testFilter_5()
+		throws Exception {
+		Brick fixture = new Brick("Server2", BRICK_STATUS.OFFLINE, "/md1/test");
+
+		String filterString = "";
+		boolean caseSensitive = false;
+
+		boolean result = fixture.filter(filterString, caseSensitive);
+		assertTrue(result);
+	}
+	
+	/**
+	 * Run the boolean filter(String,boolean) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/17/11 4:39 PM
+	 */
+	@Test
+	public void testFilter_6()
+		throws Exception {
+		Brick fixture = new Brick("Server2", BRICK_STATUS.OFFLINE, "/md1/test");
+
+		String filterString = "";
+		boolean caseSensitive = true;
+
+		boolean result = fixture.filter(filterString, caseSensitive);
+		assertTrue(result);
+	}
+	
+	
+	/**
+	 * Run the String getQualifiedName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/17/11 4:39 PM
+	 */
+	@Test
+	public void testGetQualifiedName_1()
+		throws Exception {
+		Brick fixture = new Brick("Server2", BRICK_STATUS.OFFLINE, "/md1/test");
+
+		String result = fixture.getQualifiedName();
+
+		assertNotNull(result);
+		assertEquals(result, "Server2:/md1/test");
+	}
+
+	/**
+	 * Run the String getQualifiedName() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/17/11 4:39 PM
+	 */
+	@Test
+	public void testGetQualifiedName_2()
+		throws Exception {
+		Brick fixture = new Brick("", BRICK_STATUS.OFFLINE, "");
+
+		String result = fixture.getQualifiedName();
+
+		assertNotNull(result);
+		assertEquals(result, ":");
+	}
+		
+	
+	/**
+	 * Run the String toString() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/17/11 4:39 PM
+	 */
+	@Test
+	public void testToString_1()
+		throws Exception {
+		Brick fixture = new Brick("Server2", BRICK_STATUS.OFFLINE, "/md1/test");
+
+		String result = fixture.toString();
+
+		assertNotNull(result);
+		assertEquals(result, "Server2:/md1/test");
+	}
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 10/17/11 4:39 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		// add additional set up code here
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 10/17/11 4:39 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 10/17/11 4:39 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(BrickTest.class);
+	}
+}
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/ClusterTest.java b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/ClusterTest.java
new file mode 100644
index 00000000..acb342f2
--- /dev/null
+++ b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/ClusterTest.java
@@ -0,0 +1,229 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.core.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Cluster;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Brick.BRICK_STATUS;
+import org.gluster.storage.management.core.model.Device.DEVICE_STATUS;
+import org.gluster.storage.management.core.model.Device.DEVICE_TYPE;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+
+/**
+ * The class <code>ClusterTest</code> contains tests for the class <code>{@link Cluster}</code>.
+ *
+ * @generatedBy CodePro at 10/18/11 2:53 PM
+ * @author root
+ * @version $Revision: 1.0 $
+ */
+public class ClusterTest {
+	private Cluster fixture;
+	
+	public List<Disk> getDisks(Server server) {
+		List<Disk> disks = new ArrayList<Disk>();
+		disks.add(new Disk(server, "sda", "", 12456.0, 0.0, DEVICE_STATUS.UNINITIALIZED));
+		Disk disk = new Disk(server, "sdb1", "/export", 134342456.0, 120343.0, DEVICE_STATUS.INITIALIZED);
+		disk.setType(DEVICE_TYPE.DATA);
+		disks.add(disk);
+		disk = new Disk(server, "sdc2", "/export", 876534346.0, 56334.0, DEVICE_STATUS.INITIALIZED);
+		disk.setType(DEVICE_TYPE.DATA);
+		disks.add(disk);
+		return disks;
+	}
+	
+	public List<GlusterServer> getServers() {
+		List<GlusterServer> servers = new ArrayList<GlusterServer>();
+		GlusterServer server1 = new GlusterServer("Server1", null, SERVER_STATUS.ONLINE, 2, 10, 8, 4);
+		server1.addDisks(getDisks(server1));
+		servers.add(server1);
+		
+		GlusterServer server2 = new GlusterServer("Server2", null, SERVER_STATUS.ONLINE, 1, 90, 10, 9);
+		server2.addDisks(getDisks(server2));
+		servers.add(server2);
+		
+		GlusterServer server3 = new GlusterServer("Server3", null, SERVER_STATUS.ONLINE, 4, 50, 6, 5);
+		server3.addDisks(getDisks(server3));
+		servers.add(server3);
+		
+		GlusterServer server4 = new GlusterServer("Server4", null, SERVER_STATUS.ONLINE, 2, 40, 4, 3);
+		server4.addDisks(getDisks(server4));
+		servers.add(server4);
+
+		return servers;
+	}
+	
+	public List<Brick> getBricks(String volumeName) {
+		List<Brick> bricks = new ArrayList<Brick>();
+		Brick brick1 = new Brick("Server1", BRICK_STATUS.ONLINE, "/sda1/"+volumeName);
+		bricks.add(brick1);
+		Brick brick2 = new Brick("Server2", BRICK_STATUS.ONLINE, "/sdb1/"+volumeName);
+		bricks.add(brick2);
+		Brick brick3 = new Brick("Server3", BRICK_STATUS.ONLINE, "/sdc1/"+volumeName);
+		bricks.add(brick3);
+		Brick brick4 = new Brick("Server4", BRICK_STATUS.OFFLINE, "/sda2/"+volumeName);
+		bricks.add(brick4);
+		return bricks;
+	}
+	
+	
+	public void populateVolumes(Cluster cluster) {
+		Volume volume1 = new Volume("Songs", cluster, VOLUME_TYPE.DISTRIBUTE, TRANSPORT_TYPE.ETHERNET,
+				VOLUME_STATUS.ONLINE);
+		volume1.addBricks(getBricks(volume1.getName()));
+		cluster.addVolume(volume1);
+
+		Volume volume2 = new Volume("Movie", cluster, VOLUME_TYPE.DISTRIBUTE, TRANSPORT_TYPE.ETHERNET,
+				VOLUME_STATUS.ONLINE);
+		volume2.addBricks(getBricks(volume1.getName()));
+		cluster.addVolume(volume2);
+
+		Volume volume3 = new Volume("graphics", cluster, VOLUME_TYPE.DISTRIBUTE, TRANSPORT_TYPE.INFINIBAND,
+				VOLUME_STATUS.ONLINE);
+		volume3.addBricks(getBricks(volume1.getName()));
+		cluster.addVolume(volume3);
+
+		Volume volume4 = new Volume("cartoon", cluster, VOLUME_TYPE.DISTRIBUTE, TRANSPORT_TYPE.ETHERNET,
+				VOLUME_STATUS.ONLINE);
+		volume4.addBricks(getBricks(volume1.getName()));
+		cluster.addVolume(volume4);
+		return;
+	}
+	
+	/**
+	 * Run the double getDiskSpaceInUse() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/18/11 2:53 PM
+	 */
+	@Test
+	public void testGetDiskSpaceInUse_1()
+		throws Exception {
+		double result = fixture.getDiskSpaceInUse();
+
+		assertEquals(706708.0, result, 0.1);
+	}
+
+	/**
+	 * Run the GlusterServer getServer(String) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/18/11 2:53 PM
+	 */
+	@Test
+	public void testGetServer_1()
+		throws Exception {
+		GlusterServer result = fixture.getServer("Server1");
+
+		assertNotNull(result);
+		assertEquals("Server1", result.getName());
+		assertEquals(2, result.getNumOfCPUs());
+		assertEquals(3, result.getNumOfDisks() );
+	}
+
+	/**
+	 * Run the double getTotalDiskSpace() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/18/11 2:53 PM
+	 */
+	@Test
+	public void testGetTotalDiskSpace_1()
+		throws Exception {
+		double result = fixture.getTotalDiskSpace();
+		assertEquals(4043557032.0, result, 0.1);   // Including unformatted disks(!)
+	}
+
+	/**
+	 * Run the double getTotalDiskSpace() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/18/11 2:53 PM
+	 */
+	@Test
+	public void testGetVolume_1()
+		throws Exception {
+		populateVolumes(fixture);	
+		Volume result = fixture.getVolume("Songs");
+		assertNotNull(result);
+		assertTrue(result instanceof Volume);
+	}
+
+
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 10/18/11 2:53 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		fixture = new Cluster();
+		fixture.setServers(getServers());
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 10/18/11 2:53 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 10/18/11 2:53 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(ClusterTest.class);
+	}
+}
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/DiskTest.java b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/DiskTest.java
new file mode 100644
index 00000000..c709fb60
--- /dev/null
+++ b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/DiskTest.java
@@ -0,0 +1,495 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.core.model;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.ArrayList;
+
+import org.gluster.storage.management.core.model.Device.DEVICE_STATUS;
+import org.gluster.storage.management.core.model.Device.DEVICE_TYPE;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+
+/**
+ * The class <code>DiskTest</code> contains tests for the class <code>{@link Disk}</code>.
+ *
+ * @generatedBy CodePro at 10/19/11 6:26 PM
+ * @author root
+ * @version $Revision: 1.0 $
+ */
+public class DiskTest {
+	private Disk disk;
+	
+	/**
+	 * Run the Disk() constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testDisk_1()
+		throws Exception {
+
+		// add additional test code here
+		assertNotNull(disk);
+		assertEquals(new Double(5000.0), disk.getSpace());
+		assertEquals("Hitachi HTS72323 ATA", disk.getDescription());
+		assertEquals(true, disk.isReady());
+		assertEquals(null, disk.getDiskInterface());
+		assertEquals(null, disk.getRaidDisks());
+		assertEquals(false, disk.hasPartitions());
+		assertEquals(new Double(3000.0), disk.getSpaceInUse());
+		assertEquals(DEVICE_TYPE.DATA, disk.getType());
+		assertEquals(new Double(2000.0), disk.getFreeSpace());
+		assertEquals(DEVICE_STATUS.INITIALIZED, disk.getStatus());
+		assertEquals("Server1:sda1", disk.getQualifiedName());
+		assertEquals(true, disk.isInitialized());
+		assertEquals(false, disk.hasErrors());
+		assertEquals("Server1", disk.getServerName());
+		assertEquals("Available", disk.getStatusStr());
+		assertEquals(false, disk.isUninitialized());
+		assertEquals("/md0/sda1", disk.getMountPoint());
+		assertEquals("ext4", disk.getFsType());
+		assertEquals("3.2.3", disk.getFsVersion());
+		assertEquals("sda1", disk.toString());
+		assertEquals("sda1", disk.getName());
+		assertTrue(disk.getParent() instanceof Server);
+	}
+
+	/**
+	 * Run the Disk(Server,String,String,Double,Double,DEVICE_STATUS) constructor test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testDisk_2()
+		throws Exception {
+		Server server = new Server();
+		String name = "";
+		String mountPoint = "";
+		Double space = new Double(1.0);
+		Double spaceInUse = new Double(1.0);
+		Device.DEVICE_STATUS status = Device.DEVICE_STATUS.INITIALIZED;
+
+		Disk newDisk = new Disk(server, name, mountPoint, space, spaceInUse, status);
+
+		// add additional test code here
+		assertNotNull(newDisk);
+		assertEquals(new Double(1.0), newDisk.getSpace());
+		assertEquals(null, newDisk.getDescription());
+		assertEquals(false, newDisk.isReady());
+		assertEquals(null, newDisk.getDiskInterface());
+		assertEquals(null, newDisk.getRaidDisks());
+		assertEquals(false, newDisk.hasPartitions());
+		assertEquals(new Double(1.0), newDisk.getSpaceInUse());
+		assertEquals(null, newDisk.getType());
+		assertEquals(new Double(0.0), newDisk.getFreeSpace());
+		assertEquals("null:", newDisk.getQualifiedName());
+		assertEquals(true, newDisk.isInitialized());
+		assertEquals(false, newDisk.hasErrors());
+		assertEquals(null, newDisk.getServerName());
+		assertEquals("Initialized", newDisk.getStatusStr());
+		assertEquals(false, newDisk.isUninitialized());
+		assertEquals("", newDisk.getMountPoint());
+		assertEquals(null, newDisk.getFsType());
+		assertEquals(null, newDisk.getFsVersion());
+		assertEquals("", newDisk.toString());
+		assertEquals("", newDisk.getName());
+	}
+
+	/**
+	 * Run the void copyFrom(Disk) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testCopyFrom_1()
+		throws Exception {
+		Disk newDisk = new Disk();
+		newDisk.copyFrom(disk);
+		
+		assertEquals(newDisk.getSpace(), disk.getSpace());
+		assertEquals(newDisk.getDescription(), disk.getDescription());
+		assertEquals(newDisk.isReady(), disk.isReady());
+		assertEquals(newDisk.getDiskInterface(), disk.getDiskInterface());
+		assertEquals(newDisk.getRaidDisks(), disk.getRaidDisks());
+		assertEquals(newDisk.hasPartitions(), disk.hasPartitions());
+		assertEquals(newDisk.getSpaceInUse(), disk.getSpaceInUse());
+		assertEquals(newDisk.getType(), disk.getType());
+		assertEquals(newDisk.getFreeSpace(), disk.getFreeSpace());
+		assertEquals(newDisk.getStatus(), disk.getStatus());
+		assertEquals(newDisk.getQualifiedName(), disk.getQualifiedName());
+		assertEquals(newDisk.isInitialized(), disk.isInitialized());
+		assertEquals(newDisk.hasErrors(), disk.hasErrors());
+		assertEquals(newDisk.getServerName(), disk.getServerName());
+		assertEquals(newDisk.getStatusStr(), disk.getStatusStr());
+		assertEquals(newDisk.isUninitialized(), disk.isUninitialized());
+		assertEquals(newDisk.getMountPoint(), disk.getMountPoint());
+		assertEquals(newDisk.getFsType(), disk.getFsType());
+		assertEquals(newDisk.getFsVersion(), disk.getFsVersion());
+		assertEquals(newDisk.toString(), disk.toString());
+		assertEquals(newDisk.getName(), disk.getName());
+		assertEquals(newDisk.getParent(), disk.getParent());
+	}
+
+	/**
+	 * Run the boolean equals(Object) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testEquals_1()
+		throws Exception {
+		
+		Disk newDisk = new Disk();
+		newDisk.copyFrom(disk);
+		boolean result = newDisk.equals(disk);
+		
+		assertTrue(result);
+	}
+
+	/**
+	 * Run the boolean equals(Object) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testEquals_2()
+		throws Exception {
+		Server server = new Server();
+		String name = "";
+		String mountPoint = "";
+		Double space = new Double(1.0);
+		Double spaceInUse = new Double(1.0);
+		Device.DEVICE_STATUS status = Device.DEVICE_STATUS.INITIALIZED;
+		Disk newDisk  = new Disk(server, name, mountPoint, space, spaceInUse, status);
+
+		boolean result = newDisk.equals(disk);
+
+		assertTrue(!result);
+	}
+
+	/**
+	 * Run the boolean equals(Object) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testEquals_3()
+		throws Exception {
+		
+		Disk newDisk  = new Disk();
+		newDisk.copyFrom(disk);
+		boolean result = newDisk.equals(disk);
+
+		assertTrue(result);
+	}
+
+	
+	/**
+	 * Run the boolean filter(String,boolean) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testFilter_1()
+		throws Exception {
+		String filterString = "";
+		boolean caseSensitive = true;
+		boolean result = disk.filter(filterString, caseSensitive);
+		
+		assertTrue(result);
+	}
+
+	/**
+	 * Run the boolean filter(String,boolean) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testFilter_2()
+		throws Exception {
+		String filterString = "Serv";
+		boolean caseSensitive = true;
+		boolean result = disk.filter(filterString, caseSensitive);
+
+		assertTrue(result);
+	}
+
+	/**
+	 * Run the boolean filter(String,boolean) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testFilter_3()
+		throws Exception {
+		String filterString = "serv";
+		boolean caseSensitive = true;
+		boolean result = disk.filter(filterString, caseSensitive);
+		assertTrue(!result);
+	}
+
+	/**
+	 * Run the boolean filter(String,boolean) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testFilter_4()
+		throws Exception {
+		String filterString = "hitachi";
+		boolean caseSensitive = true;
+
+		boolean result = disk.filter(filterString, caseSensitive);
+		assertTrue(!result);
+	}
+
+
+	
+	/**
+	 * Run the boolean filter(String,boolean) method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testFilter_5()
+		throws Exception {
+		String filterString = "hitachi";
+		boolean caseSensitive = false;
+
+		boolean result = disk.filter(filterString, caseSensitive);
+		assertTrue(result);
+	}
+
+
+	/**
+	 * Run the Double getSpace() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testGetSpace_1()
+		throws Exception {
+		Double result = disk.getSpace();
+		assertNotNull(result);
+		assertTrue(result instanceof Double);
+	}
+
+
+
+	/**
+	 * Run the Double getSpaceInUse() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testGetSpaceInUse_1()
+		throws Exception {
+		Double result = disk.getSpaceInUse();
+		assertNotNull(result);
+		assertTrue(result instanceof Double);
+	}
+
+
+	/**
+	 * Run the boolean hasPartitions() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testHasPartitions_1()
+		throws Exception {
+		disk.setPartitions(new ArrayList<Partition>());
+		boolean result = disk.hasPartitions();
+		assertTrue(!result);
+	}
+
+	
+
+	/**
+	 * Run the boolean isReady() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testIsReady_1()
+		throws Exception {
+		boolean result = disk.isReady();
+		System.out.println("Disk status is [" + result + "] on [" + disk.getName() +"] and Status is [" + disk.getStatusStr() +"]");
+		assertTrue(result);
+	}
+
+	/**
+	 * Run the boolean isReady() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testIsReady_2()
+		throws Exception {
+		disk.setPartitions(new ArrayList<Partition>());
+		boolean result = disk.isReady();
+		assertTrue(result);
+	}
+
+	/**
+	 * Run the boolean isReady() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testIsReady_3()
+		throws Exception {
+		disk.setStatus(DEVICE_STATUS.UNINITIALIZED);
+		boolean result = disk.isReady();
+		assertTrue(!result);
+	}
+
+	/**
+	 * Run the boolean isReady() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testIsReady_4()
+		throws Exception {
+		disk.setStatus(DEVICE_STATUS.IO_ERROR);
+		boolean result = disk.isReady();
+
+		assertTrue(!result);
+	}
+
+	/**
+	 * Run the boolean isReady() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testIsReady_5()
+		throws Exception {
+		disk.setStatus(DEVICE_STATUS.INITIALIZING);
+		boolean result = disk.isReady();
+
+		assertTrue(!result);
+	}
+
+	/**
+	 * Run the boolean isReady() method test.
+	 *
+	 * @throws Exception
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Test
+	public void testIsReady_6()
+		throws Exception {
+		disk.setStatus(DEVICE_STATUS.UNKNOWN);
+		boolean result = disk.isReady();
+
+		assertTrue(!result);
+	}
+
+	
+	/**
+	 * Perform pre-test initialization.
+	 *
+	 * @throws Exception
+	 *         if the initialization fails for some reason
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@Before
+	public void setUp()
+		throws Exception {
+		Server server = new Server("Server1", null, 2, 25D, 5000D, 2000D);
+		disk = new Disk(server,"sda1", "/md0/sda1", 5000D, 3000D, DEVICE_STATUS.INITIALIZED);
+		disk.setDescription("Hitachi HTS72323 ATA");
+		disk.setFsType("ext4");
+		disk.setFsVersion("3.2.3");
+		disk.setType(DEVICE_TYPE.DATA);
+	}
+
+	/**
+	 * Perform post-test clean-up.
+	 *
+	 * @throws Exception
+	 *         if the clean-up fails for some reason
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	@After
+	public void tearDown()
+		throws Exception {
+		// Add additional tear down code here
+	}
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	public static void main(String[] args) {
+		new org.junit.runner.JUnitCore().run(DiskTest.class);
+	}
+}
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/TestAll.java b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/TestAll.java
new file mode 100644
index 00000000..b4e26f8f
--- /dev/null
+++ b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/model/TestAll.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.core.model;
+
+import org.junit.runner.JUnitCore;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * The class <code>TestAll</code> builds a suite that can be used to run all
+ * of the tests within its package as well as within any subpackages of its
+ * package.
+ *
+ * @generatedBy CodePro at 10/19/11 6:26 PM
+ * @author root
+ * @version $Revision: 1.0 $
+ */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+	BrickTest.class,
+	ClusterTest.class,
+	AlertTest.class,
+	DiskTest.class,
+})
+public class TestAll {
+
+	/**
+	 * Launch the test.
+	 *
+	 * @param args the command line arguments
+	 *
+	 * @generatedBy CodePro at 10/19/11 6:26 PM
+	 */
+	public static void main(String[] args) {
+		JUnitCore.runClasses(new Class[] { TestAll.class });
+	}
+}
diff --git a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/DateUtilTest.java b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/DateUtilTest.java
index c19b75d2..a2e29450 100644
--- a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/DateUtilTest.java
+++ b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/DateUtilTest.java
@@ -1,15 +1,34 @@
-package com.gluster.storage.management.core.utils;
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.core.utils;
 
 import static org.junit.Assert.assertEquals;
 
 import java.util.Date;
 
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.utils.DateUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 
 /**
  * The class <code>DateUtilTest</code> contains tests for the class <code>{@link DateUtil}</code>.
diff --git a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/FileUtilTest.java b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/FileUtilTest.java
index 9302619e..0418acf9 100644
--- a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/FileUtilTest.java
+++ b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/FileUtilTest.java
@@ -1,4 +1,22 @@
-package com.gluster.storage.management.core.utils;
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.core.utils;
 
 import static org.junit.Assert.*;
 
@@ -8,11 +26,12 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
 
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.utils.FileUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 
 
 /**
@@ -144,7 +163,7 @@ public class FileUtilTest {
 		throws Exception {
 		File file = new File("");
 		
-		byte[] result = FileUtil.readFileAsByteArray(file);
+		FileUtil.readFileAsByteArray(file);
 	}
 
 	/**
diff --git a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/StringUtilTest.java b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/StringUtilTest.java
index dc8c6c80..d428eae4 100644
--- a/src/com.gluster.storage.management.core/junit/com/gluster/storage/management/core/utils/StringUtilTest.java
+++ b/src/org.gluster.storage.management.core/junit/org/gluster/storage/management/core/utils/StringUtilTest.java
@@ -1,4 +1,22 @@
-package com.gluster.storage.management.core.utils;
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.core.utils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -7,6 +25,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.gluster.storage.management.core.utils.StringUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -106,7 +125,6 @@ public class StringUtilTest {
 	public void testEnumToArray_1()
 		throws Exception {
 
-		String[] expected = new String[] {"WINTER", "SPRING", "SUMMER", "FALL"};
 		List<String> result = StringUtil.enumToArray(Season.values());
 
 		assertNotNull(result);
diff --git a/src/com.gluster.storage.management.core/junit/test/test.txt b/src/org.gluster.storage.management.core/junit/test/test.txt
index 267ce144..267ce144 100644
--- a/src/com.gluster.storage.management.core/junit/test/test.txt
+++ b/src/org.gluster.storage.management.core/junit/test/test.txt
diff --git a/src/com.gluster.storage.management.gateway/WebContent/META-INF/MANIFEST.MF b/src/org.gluster.storage.management.core/src/META-INF/MANIFEST.MF
index 5e949512..5e949512 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/META-INF/MANIFEST.MF
+++ b/src/org.gluster.storage.management.core/src/META-INF/MANIFEST.MF
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/CoreConstants.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/constants/CoreConstants.java
index 42f0e7a9..4aa7500e 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/CoreConstants.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/constants/CoreConstants.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.constants;
+package org.gluster.storage.management.core.constants;
 
 
 /**
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/GlusterConstants.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/constants/GlusterConstants.java
index cbc51b10..615a6849 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/GlusterConstants.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/constants/GlusterConstants.java
@@ -1,26 +1,27 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.constants;
+package org.gluster.storage.management.core.constants;
 
 import java.util.List;
 
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 /**
  *
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/constants/RESTConstants.java
index ea0e723f..bd4b283b 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/constants/RESTConstants.java
@@ -1,24 +1,22 @@
-/**
- * RESTConstants.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.core.constants;
+ *******************************************************************************/
+package org.gluster.storage.management.core.constants;
 
 /**
  * All constants related to the Gluster REST server and client
@@ -44,6 +42,7 @@ public class RESTConstants {
 	public static final String RESOURCE_KEYS = "keys";
 	public static final String RESOURCE_STATISTICS = "statistics";
 	public static final String RESOURCE_USERS = "users";
+	public static final String RESOURCE_FSTYPES = "fstypes";
 	
 	public static final String TASK_START = "start";
 	public static final String TASK_PAUSE = "pause";
@@ -87,6 +86,7 @@ public class RESTConstants {
 	public static final String FORM_PARAM_OLD_PASSWORD = "oldPassword";
 	public static final String FORM_PARAM_NEW_PASSWORD = "newPassword";
 	public static final String FORM_PARAM_FORCE = "force";
+	public static final String FORM_PARAM_MOUNTPOINT = "mountPoint";
 	
 	public static final String PATH_PARAM_FORMAT = "format";
 	public static final String PATH_PARAM_VOLUME_NAME = "volumeName";
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/exceptions/ConnectionException.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/exceptions/ConnectionException.java
index ec19ffd8..e98e260c 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/exceptions/ConnectionException.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/exceptions/ConnectionException.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.exceptions;
+package org.gluster.storage.management.core.exceptions;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/exceptions/GlusterRuntimeException.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/exceptions/GlusterRuntimeException.java
index e7e604fc..a754c049 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/exceptions/GlusterRuntimeException.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/exceptions/GlusterRuntimeException.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.exceptions;
+package org.gluster.storage.management.core.exceptions;
 
 public class GlusterRuntimeException extends RuntimeException {
 	private static final long serialVersionUID = 1L;
diff --git a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/exceptions/GlusterValidationException.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/exceptions/GlusterValidationException.java
new file mode 100644
index 00000000..79a50ea1
--- /dev/null
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/exceptions/GlusterValidationException.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.core.exceptions;
+
+public class GlusterValidationException extends GlusterRuntimeException {
+	private static final long serialVersionUID = 1L;
+
+	public GlusterValidationException(String message) {
+		super(message);
+	}
+}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Alert.java
index ceb3e77e..f55c9d35 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Alert.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Alert.java
@@ -1,7 +1,26 @@
-package com.gluster.storage.management.core.model;
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.core.model;
 
 import org.eclipse.osgi.internal.signedcontent.Base64;
 
+@SuppressWarnings("restriction")
 public class Alert extends Entity {
 
 	public enum ALERT_TYPES {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Brick.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Brick.java
index 0b8ad6fd..daf5cea8 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Brick.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Brick.java
@@ -1,27 +1,28 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 @XmlRootElement
 public class Brick extends Entity {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Cluster.java
index e11199f6..7b25b4bc 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Cluster.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Cluster.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/ClusterListener.java
index eb8c191e..ce9d5613 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ClusterListener.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/ClusterListener.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 /**
  * Interface for a cluster listener. Every registered listener will be notified
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ConnectionDetails.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/ConnectionDetails.java
index 9f66ba5b..299c816a 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ConnectionDetails.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/ConnectionDetails.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 /**
  * Class used for binding UI fields on login / password-change dialog boxes
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/DefaultClusterListener.java
index eb98090f..d7823ffb 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/DefaultClusterListener.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/DefaultClusterListener.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 /**
  * Default listener - doesn't do anything. Sub-class and override the method for
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Device.java
index b0121213..014826c3 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Device.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Device.java
@@ -1,27 +1,28 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 
 /**
@@ -214,11 +215,13 @@ public class Device extends Entity {
 
 	public void copyFrom(Device newDevice) {
 		setName(newDevice.getName());
+		setParent(newDevice.getParent());
 		setMountPoint(newDevice.getMountPoint());
 		setServerName(newDevice.getServerName());
 		setStatus(newDevice.getStatus());
 		setFsType(newDevice.getFsType());
 		setType(newDevice.getType());
+		setFsVersion(newDevice.getFsVersion());
 		setSpace(newDevice.getSpace());
 		setSpaceInUse(newDevice.getSpaceInUse());
 	}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Disk.java
index 4b159f37..fee589eb 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Disk.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Disk.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,8 +25,9 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 @XmlRootElement(name="disk")
 public class Disk extends Device {
@@ -117,8 +118,8 @@ public class Disk extends Device {
 		
 		Disk disk = (Disk)obj;
 		
-		if (!(super.equals(obj) && getDescription().equals(disk.getDescription()) && getDiskInterface().equals(
-				disk.getDiskInterface()))) {
+		if (!(super.equals(obj) && getDescription().equals(disk.getDescription()) && (getDiskInterface() == disk.getDiskInterface() || getDiskInterface().equals(
+				disk.getDiskInterface()) ))) {
 			return false;
 		}
 		
@@ -145,6 +146,9 @@ public class Disk extends Device {
 	public void copyFrom(Disk newDisk) {
 		super.copyFrom(newDisk);
 		setDescription(newDisk.getDescription());
+		setDiskInterface(newDisk.getDiskInterface());
+		setPartitions(newDisk.getPartitions());
+		setRaidDisks(newDisk.getRaidDisks());
 	}
 	
 	@Override
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Entity.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Entity.java
index b905afc3..cfee7d19 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Entity.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Entity.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,12 +25,11 @@ import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
 import org.eclipse.core.runtime.PlatformObject;
+import org.gluster.storage.management.core.utils.StringUtil;
 
-import com.gluster.storage.management.core.utils.StringUtil;
 
 @XmlRootElement
 public class Entity extends PlatformObject implements Filterable {
-	private static final long serialVersionUID = 1L;
 
 	protected String name;
 	protected List<Entity> children = new ArrayList<Entity>();
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/EntityGroup.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/EntityGroup.java
index 8e0311f5..db42807a 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/EntityGroup.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/EntityGroup.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.List;
 
@@ -33,10 +33,12 @@ public class EntityGroup<T extends Entity> extends Entity {
 		this.type = type;
 	}
 
+	@SuppressWarnings("unchecked")
 	public List<T> getEntities() {
 		return (List<T>)children;
 	}
 
+	@SuppressWarnings("unchecked")
 	public void setEntities(List<T> entities) {
 		children = (List<Entity>)entities;
 	}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Event.java
index fe7b8495..1444e8d4 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Event.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Event.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 public class Event {
 	public enum EVENT_TYPE {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Filterable.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Filterable.java
index 9a2ed405..935fac29 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Filterable.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Filterable.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 /**
  * By default, the {@link EntityViewerFilter} filters the objects by parsing the
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDataModel.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/GlusterDataModel.java
index 733527c3..6a825f2f 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDataModel.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/GlusterDataModel.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/GlusterDummyModel.java
index 2139bbd7..6b21790f 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterDummyModel.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/GlusterDummyModel.java
@@ -1,39 +1,40 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
-import com.gluster.storage.management.core.model.Device.DEVICE_STATUS;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+import org.gluster.storage.management.core.model.Device.DEVICE_STATUS;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+
 
 public class GlusterDummyModel {
 	// private Server discoveredServer1, discoveredServer2, discoveredServer3, discoveredServer4, discoveredServer5;
-	private GlusterServer server1, server2, server3, server4, server5;
+	private GlusterServer server1, server2, server4, server5;
 	private Volume volume1, volume2, volume3, volume4, volume5;
-	private Disk s1da, s1db, s2da, s2db, s2dc, s2dd, s3da, s4da, s5da, s5db;
+	private Disk s1da, s1db, s2da, s2db, s2dc, s2dd, s4da, s5da, s5db;
 	private static List<VolumeLogMessage> logMessages = new ArrayList<VolumeLogMessage>();
 	private static GlusterDummyModel instance = new GlusterDummyModel();
 	private GlusterDataModel model;
@@ -56,7 +57,6 @@ public class GlusterDummyModel {
 			double memoryInUse) {
 		GlusterServer glusterServer = new GlusterServer(name, parent, status, numOfCPUs, cpuUsage, totalMemory,
 				memoryInUse);
-		NetworkInterface networkInterface = addNetworkInterface(glusterServer, interfaceName); 
 
 		servers.add(glusterServer);
 		return glusterServer;
@@ -173,7 +173,6 @@ public class GlusterDummyModel {
 		List<GlusterServer> servers = new ArrayList<GlusterServer>();
 		server1 = addGlusterServer(servers, cluster, "Server1", SERVER_STATUS.ONLINE, "eth0", 4, 56.3, 16, 8.4);
 		server2 = addGlusterServer(servers, cluster, "Server2", SERVER_STATUS.ONLINE, "eth1", 8, 41.92, 32, 18.76);
-		server3 = addGlusterServer(servers, cluster, "Server3", SERVER_STATUS.OFFLINE, "eth0", -1, -1, -1, -1);
 		server4 = addGlusterServer(servers, cluster, "Server4", SERVER_STATUS.ONLINE, "eth0", 1, 92.83, 4, 3.18);
 		server5 = addGlusterServer(servers, cluster, "Server5", SERVER_STATUS.ONLINE, "inf0", 2, 87.24, 8, 7.23);
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/GlusterServer.java
index 9c7ac80b..1b396265 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/GlusterServer.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/GlusterServer.java
@@ -1,26 +1,27 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 @XmlRootElement(name = "glusterServer")
 public class GlusterServer extends Server {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/InitDiskStatusResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/InitDiskStatusResponse.java
index f09dfc88..d55f88cb 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/InitDiskStatusResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/InitDiskStatusResponse.java
@@ -1,24 +1,22 @@
 /*******************************************************************************
- * InitDiskStatusResponse.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/NetworkInterface.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/NetworkInterface.java
index 181b8e66..e9ef6f50 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/NetworkInterface.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/NetworkInterface.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Partition.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Partition.java
index ecf4035b..bbbc94de 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Partition.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Partition.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Response.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Response.java
index 96ea8497..46988678 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Response.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Response.java
@@ -1,37 +1,37 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;

-

-/**

- * Interface for server response. Any request handled by the Gluster Management

- * Server will result in a response that must be an instance of a class

- * implementing this interface.

- */

+package org.gluster.storage.management.core.model;
+
+/**
+ * Interface for server response. Any request handled by the Gluster Management
+ * Server will result in a response that must be an instance of a class
+ * implementing this interface.
+ */
 public interface Response<T> {
-	/**

-	 * @return Status of request processing

-	 */

-	public Status getStatus();

-

-	/**

-	 * @return Data associated with the response. e.g. A "discover servers"

-	 *         request will return the list of discovered servers.

-	 */

-	public T getData();

-}

+	/**
+	 * @return Status of request processing
+	 */
+	public Status getStatus();
+
+	/**
+	 * @return Data associated with the response. e.g. A "discover servers"
+	 *         request will return the list of discovered servers.
+	 */
+	public T getData();
+}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Server.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Server.java
index 3662188c..a0d20d01 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Server.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Server.java
@@ -1,21 +1,22 @@
 /*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -25,8 +26,9 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 @XmlRootElement(name = "server")
 public class Server extends Entity {
@@ -244,4 +246,4 @@ public class Server extends Entity {
 
 		return true;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ServerStats.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/ServerStats.java
index 042af256..7a9a006d 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ServerStats.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/ServerStats.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ServerStatsRow.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/ServerStatsRow.java
index 0088cef6..02c78271 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/ServerStatsRow.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/ServerStatsRow.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/StatsMetadata.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/StatsMetadata.java
index 22b42671..7f814cd3 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/StatsMetadata.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/StatsMetadata.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Status.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Status.java
index fc824db2..4fdcd534 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Status.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Status.java
@@ -1,27 +1,28 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.utils.ProcessResult;
+import org.gluster.storage.management.core.utils.ProcessResult;
+
 
 @XmlRootElement(name = "status")
 public class Status {
@@ -33,6 +34,7 @@ public class Status {
 	public static final int STATUS_CODE_PAUSE = 4;
 	public static final int STATUS_CODE_WARNING = 5;
 	public static final int STATUS_CODE_COMMIT_PENDING = 6;
+	public static final int STATUS_CODE_ERROR = 7;
 	public static final Status STATUS_SUCCESS = new Status(STATUS_CODE_SUCCESS, "Success");
 	public static final Status STATUS_FAILURE = new Status(STATUS_CODE_FAILURE, "Failure");
 	
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/TaskInfo.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/TaskInfo.java
index 43299863..65f44d44 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/TaskInfo.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/TaskInfo.java
@@ -1,29 +1,28 @@
-/**
- * TaskInfo.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.core.model;
+ *******************************************************************************/
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 @XmlRootElement
 public class TaskInfo extends Entity {
@@ -104,7 +103,7 @@ public class TaskInfo extends Entity {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.core.model.Entity#filter(java.lang.String, boolean)
+	 * @see org.gluster.storage.management.core.model.Entity#filter(java.lang.String, boolean)
 	 */
 	@Override
 	public boolean filter(String filterString, boolean caseSensitive) {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/TaskStatus.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/TaskStatus.java
index 579cc9da..920cd47b 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/TaskStatus.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/TaskStatus.java
@@ -1,24 +1,22 @@
-/**
- * TaskStatus.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.core.model;
+ *******************************************************************************/
+package org.gluster.storage.management.core.model;
 
 public class TaskStatus extends Status {
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/User.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/User.java
index ed5d12f7..efa1835f 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/User.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/User.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Version.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Version.java
index 887506a9..6749a530 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Version.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Version.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 /**
  * 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Volume.java
index 9356f14a..a8d54dbe 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/Volume.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/Volume.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -33,9 +33,10 @@ import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlTransient;
 
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 @XmlRootElement
 public class Volume extends Entity {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeLogMessage.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/VolumeLogMessage.java
index 7b7b77c8..21b42aae 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeLogMessage.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/VolumeLogMessage.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.Date;
 
@@ -24,8 +24,9 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-import com.gluster.storage.management.core.model.adapters.VolumeLogDateAdapter;
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.model.adapters.VolumeLogDateAdapter;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 @XmlRootElement
 public class VolumeLogMessage implements Filterable {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeOption.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/VolumeOption.java
index 6eb0c1bf..8c6d1d82 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeOption.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/VolumeOption.java
@@ -1,26 +1,27 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+
 
 /**
  *
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeOptionInfo.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/VolumeOptionInfo.java
index 2cafc4b5..0e166c1c 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeOptionInfo.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/VolumeOptionInfo.java
@@ -1,24 +1,22 @@
-/**
- * VolumeOptionInfo.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.core.model;
+ *******************************************************************************/
+package org.gluster.storage.management.core.model;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeOptions.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/VolumeOptions.java
index edeec768..90aaba54 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/VolumeOptions.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/VolumeOptions.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.model;
+package org.gluster.storage.management.core.model;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/adapters/VolumeLogDateAdapter.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/adapters/VolumeLogDateAdapter.java
index fac208ad..a1a50de4 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/model/adapters/VolumeLogDateAdapter.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/model/adapters/VolumeLogDateAdapter.java
@@ -1,29 +1,30 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
 
-package com.gluster.storage.management.core.model.adapters;
+package org.gluster.storage.management.core.model.adapters;
 
 import java.util.Date;
 
 import javax.xml.bind.annotation.adapters.XmlAdapter;
 
-import com.gluster.storage.management.core.utils.DateUtil;
+import org.gluster.storage.management.core.utils.DateUtil;
+
 
 /**
  * Adapter class used for converting timestamp from Gluster volume log files to Date object.
diff --git a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/AbstractResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/AbstractResponse.java
new file mode 100644
index 00000000..d0c386c1
--- /dev/null
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/AbstractResponse.java
@@ -0,0 +1,35 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.core.response;
+
+import org.gluster.storage.management.core.model.Response;
+import org.gluster.storage.management.core.model.Status;
+
+public abstract class AbstractResponse implements Response<Object> {
+	private Status status;
+
+	@Override
+	public Status getStatus() {
+		return status;
+	}
+
+	public void setStatus(Status status) {
+		this.status = status;
+	}
+}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/ClusterNameListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/ClusterNameListResponse.java
index 3b10ac86..ddac126d 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/ClusterNameListResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/ClusterNameListResponse.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/FsTypeListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/FsTypeListResponse.java
new file mode 100644
index 00000000..4bd61d69
--- /dev/null
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/FsTypeListResponse.java
@@ -0,0 +1,45 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.core.response;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "fsTypes")
+public class FsTypeListResponse  {
+	private List<String> fsTypes;
+	
+	public FsTypeListResponse() {
+	}
+	
+	public FsTypeListResponse(List<String> fsTypes) {
+		setFsTypes(fsTypes);
+	}
+	
+	@XmlElement(name = "fsType", type=String.class)
+	public List<String> getFsTypes() {
+		return fsTypes;
+	}
+
+	public void setFsTypes(List<String> fsTypes) {
+		this.fsTypes = fsTypes;
+	}
+}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/GlusterServerListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/GlusterServerListResponse.java
index 868e2fc2..3e97bb71 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/GlusterServerListResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/GlusterServerListResponse.java
@@ -1,24 +1,22 @@
-/**
- * GlusterServerListResponse.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.core.response;
+ *******************************************************************************/
+package org.gluster.storage.management.core.response;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,7 +24,8 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.GlusterServer;
+
 
 /**
  *
diff --git a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/GlusterServerResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/GlusterServerResponse.java
new file mode 100644
index 00000000..89d8affc
--- /dev/null
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/GlusterServerResponse.java
@@ -0,0 +1,54 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.core.response;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlTransient;
+
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Status;
+
+
+@XmlRootElement(name = "response")
+public class GlusterServerResponse extends AbstractResponse {
+	private GlusterServer glusterServer;
+	
+	public GlusterServerResponse() {
+	}
+	
+	public GlusterServerResponse(Status status, GlusterServer server) {
+		setStatus(status);
+		setGlusterServer(server);
+	}
+	
+	public GlusterServer getGlusterServer() {
+		return glusterServer;
+	}
+
+	public void setGlusterServer(GlusterServer glusterServer) {
+		this.glusterServer = glusterServer;
+	}
+
+	@XmlTransient
+	@Override
+	public GlusterServer getData() {
+		return getGlusterServer();
+	}
+	
+}
diff --git a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/LogMessageListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/LogMessageListResponse.java
new file mode 100644
index 00000000..32370260
--- /dev/null
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/LogMessageListResponse.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+/**
+ * 
+ */
+package org.gluster.storage.management.core.response;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.gluster.storage.management.core.model.VolumeLogMessage;
+
+
+@XmlRootElement(name = "logMessages")
+public class LogMessageListResponse {
+	private List<VolumeLogMessage> logMessages = new ArrayList<VolumeLogMessage>();
+	
+	public LogMessageListResponse() {
+	}
+	
+	public LogMessageListResponse(List<VolumeLogMessage> logMessages) {
+		setLogMessages(logMessages);
+	}
+	
+	@XmlElement(name = "logMessage", type = VolumeLogMessage.class)
+	public List<VolumeLogMessage> getLogMessages() {
+		return logMessages;
+	}
+
+	public void setLogMessages(List<VolumeLogMessage> logMessages) {
+		this.logMessages = logMessages;
+	}
+}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/ServerListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/ServerListResponse.java
index 05627ab1..6f694900 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/ServerListResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/ServerListResponse.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,7 +24,8 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.Server;
+
 
 @XmlRootElement(name = "servers")
 public class ServerListResponse {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/ServerNameListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/ServerNameListResponse.java
index 2211f29f..c52b2b11 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/ServerNameListResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/ServerNameListResponse.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/StringListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/StringListResponse.java
index 785c6efb..feb6edd9 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/StringListResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/StringListResponse.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,7 +25,8 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.Status;
+
 
 @XmlRootElement(name = "response")
 public class StringListResponse extends AbstractResponse {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskIdResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/TaskIdResponse.java
index f2610104..809692b5 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskIdResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/TaskIdResponse.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskInfoListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/TaskInfoListResponse.java
index ba1c4f9f..a111eba8 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/TaskInfoListResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/TaskInfoListResponse.java
@@ -1,24 +1,22 @@
-/**
- * TaskListResponse.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.core.response;
+ *******************************************************************************/
+package org.gluster.storage.management.core.response;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,7 +24,8 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.TaskInfo;
+
 
 @XmlRootElement(name = "tasks")
 public class TaskInfoListResponse {
diff --git a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/TaskResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/TaskResponse.java
new file mode 100755
index 00000000..fa557117
--- /dev/null
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/TaskResponse.java
@@ -0,0 +1,51 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.core.response;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+
+
+@XmlRootElement(name = "response")
+public class TaskResponse  extends AbstractResponse {
+	private TaskInfo taskInfo;
+	private Status status;
+	
+	public TaskResponse() {
+	}
+	
+	public Status getStatus() {
+		return status;
+	}
+
+	public void setStatus(Status status) {
+		this.status = status;
+	}
+
+	public void setData(TaskInfo taskInfo) {
+		this.taskInfo = taskInfo;
+	}
+	
+	@Override
+	public TaskInfo getData() {
+		return taskInfo;
+	}
+}
diff --git a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/VolumeListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/VolumeListResponse.java
new file mode 100644
index 00000000..ebb73214
--- /dev/null
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/VolumeListResponse.java
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.core.response;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.gluster.storage.management.core.model.Volume;
+
+
+@XmlRootElement(name = "volumes")
+public class VolumeListResponse {
+	private List<Volume> volumes = new ArrayList<Volume>();
+
+	public VolumeListResponse() {
+
+	}
+
+	public VolumeListResponse(List<Volume> volumes) {
+		setVolumes(volumes);
+	}
+
+	@XmlElement(name = "volume", type = Volume.class)
+	public List<Volume> getVolumes() {
+		return this.volumes;
+	}
+
+	public void setVolumes(List<Volume> volumes) {
+		this.volumes = volumes;
+	}
+}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/VolumeOptionInfoListResponse.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/VolumeOptionInfoListResponse.java
index dfacf19f..49afd95f 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/response/VolumeOptionInfoListResponse.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/response/VolumeOptionInfoListResponse.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.response;
+package org.gluster.storage.management.core.response;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,7 +24,8 @@ import java.util.List;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import com.gluster.storage.management.core.model.VolumeOptionInfo;
+import org.gluster.storage.management.core.model.VolumeOptionInfo;
+
 
 @XmlRootElement(name = "options")
 public class VolumeOptionInfoListResponse {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/DateUtil.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/DateUtil.java
index 5fd9ae8b..9d97eb39 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/DateUtil.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/DateUtil.java
@@ -1,30 +1,31 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+
 
 public class DateUtil {
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/FileUtil.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/FileUtil.java
index 601a3790..e84655cb 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/FileUtil.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/FileUtil.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -24,8 +24,9 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.util.UUID;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+
 
 public class FileUtil {
 	public static String readFileAsString(File file) {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterCoreUtil.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/GlusterCoreUtil.java
index 39794b79..78b13fef 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/GlusterCoreUtil.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/GlusterCoreUtil.java
@@ -1,24 +1,22 @@
-/**
- * GlusterCoreUtil.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.core.utils;
+ *******************************************************************************/
+package org.gluster.storage.management.core.utils;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -28,11 +26,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Disk;
-import com.gluster.storage.management.core.model.Entity;
-import com.gluster.storage.management.core.model.Partition;
-import com.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Disk;
+import org.gluster.storage.management.core.model.Entity;
+import org.gluster.storage.management.core.model.Partition;
+import org.gluster.storage.management.core.model.Server;
+
 
 
 public class GlusterCoreUtil {
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/JavaUtil.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/JavaUtil.java
index fe2fc860..09e12680 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/JavaUtil.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/JavaUtil.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 import java.util.List;
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/LRUCache.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/LRUCache.java
index f3c9c72d..edd519d9 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/LRUCache.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/LRUCache.java
@@ -1,24 +1,22 @@
-/**
- * LRUCache.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Console 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Console 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.core.utils;
+ *******************************************************************************/
+package org.gluster.storage.management.core.utils;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/NumberUtil.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/NumberUtil.java
index 9b1cd5e2..ff41c6dd 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/NumberUtil.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/NumberUtil.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 import java.text.NumberFormat;
 
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ProcessResult.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/ProcessResult.java
index c297a9c4..6e5e5fbf 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ProcessResult.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/ProcessResult.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
diff --git a/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/ProcessUtil.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/ProcessUtil.java
new file mode 100644
index 00000000..9a628cad
--- /dev/null
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/ProcessUtil.java
@@ -0,0 +1,144 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.core.utils;
+
+import static org.gluster.storage.management.core.constants.CoreConstants.NEWLINE;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+
+
+/**
+ * Utility class for creating processes (foreground/background) with given
+ * command and checking the output/exit status
+ */
+public class ProcessUtil {
+
+    public static ProcessResult executeCommand(List<String> command) {
+        return executeCommand(true, command);
+    }
+
+	/**
+	 * Waits till all the threads in given list are dead
+	 * @param threads Threads to watch
+	 * @throws InterruptedException
+	 */
+	public static void waitForThreads(List<Thread> threads) throws InterruptedException {
+		// Wait till all servers have been processed
+		for (int i = threads.size() - 1; i >= 0; i--) {
+			if (threads.get(i).isAlive()) {
+				// thread alive. sleep for half a second and check again.
+				Thread.sleep(500);
+				i++; // check the same thread in next iteration
+			}
+		}
+	}
+
+    /**
+     * Executes given command in a separate process in FOREGROUND
+     * @param command
+     * @return {@link ProcessResult} object
+     */
+    public static ProcessResult executeCommand(String... command) {
+        ArrayList<String> commandList = new ArrayList<String>();
+        for (String part : command) {
+            commandList.add(part);
+        }
+        return executeCommand(commandList);
+    }
+
+	/**
+	 * Creates a process builder for executing given command with given set of environment variables
+	 * 
+	 * @param command
+	 *            The command to be executed
+	 * @param env
+	 *            Set of env variables to be made available to the command
+	 * @return Process builder that can be used to execute the command
+	 */
+	private static ProcessBuilder createProcessBuilder(List<String> command, Map<String, String> env) {
+		ProcessBuilder builder = new ProcessBuilder(command);
+		if (env != null) {
+			builder.environment().putAll(env);
+		}
+		return builder;
+	}
+
+	/**
+	 * Executes given command in foreground/background
+	 * 
+	 * @param runInForeground
+	 *            Boolean flag indicating whether the command should
+	 *            be executed in foreground
+	 * @param command
+	 * @return {@link ProcessResult} object
+	 */
+	public static ProcessResult executeCommand(boolean runInForeground, List<String> command) {
+		return executeCommand(runInForeground, command, null);
+	}
+	
+	/**
+	 * Executes given command in foreground/background
+	 * 
+	 * @param runInForeground
+	 *            Boolean flag indicating whether the command should
+	 *            be executed in foreground
+	 * @param command
+	 * @param env
+	 *            Set of env variables to be made available to the command
+	 * @return {@link ProcessResult} object
+	 */
+	public static ProcessResult executeCommand(boolean runInForeground, List<String> command, Map<String, String> env) {
+		StringBuilder output = new StringBuilder();
+		try {
+			Process process = createProcessBuilder(command, env).redirectErrorStream(true).start();
+			if (runInForeground) {
+				process.waitFor(); // Wait for process to finish
+
+				InputStream is = process.getInputStream();
+				InputStreamReader isr = new InputStreamReader(is);
+				BufferedReader br = new BufferedReader(isr);
+				String line;
+
+				while ((line = br.readLine()) != null) {
+					output.append(line);
+					output.append(NEWLINE);
+				}
+				br.close();
+				isr.close();
+				is.close();
+			} else {
+				output.append("Command [");
+				output.append(command);
+				output.append("] triggerred in background.");
+			}
+
+			return new ProcessResult(process.exitValue(), output.toString());
+		} catch (Throwable e) {
+			throw new GlusterRuntimeException("Exception while executing command [" + command + "] : ["
+					+ e.getMessage() + "]", e);
+		}
+	}
+}
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/StringUtil.java
index 26c244dd..f3515c97 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/StringUtil.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/StringUtil.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
  * This file is part of Gluster Management Console.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.core.utils;
+package org.gluster.storage.management.core.utils;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ValidationUtil.java b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/ValidationUtil.java
index df0b749a..d0509e43 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/utils/ValidationUtil.java
+++ b/src/org.gluster.storage.management.core/src/org/gluster/storage/management/core/utils/ValidationUtil.java
@@ -1,4 +1,22 @@
-package com.gluster.storage.management.core.utils;
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console 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.
+ *
+ * Gluster Management Console 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.core.utils;
 
 import java.util.regex.Pattern;
 
@@ -84,7 +102,6 @@ public class ValidationUtil {
 	}
 
 	public static void main(String[] argv) {
-		String ip = "0.0.0.0";
 		// System.out.println("Is valid ip (" + ip + ")? " + isValidIp(ip));
 		String hostName = "myhost.q";
 		// System.out.println(isValidHostName(hostName));
diff --git a/src/com.gluster.storage.management.gateway.scripts/.externalToolBuilders/org.python.pydev.PyDevBuilder.launch b/src/org.gluster.storage.management.gateway.scripts/.externalToolBuilders/org.python.pydev.PyDevBuilder.launch
index 1cae618a..1cae618a 100644
--- a/src/com.gluster.storage.management.gateway.scripts/.externalToolBuilders/org.python.pydev.PyDevBuilder.launch
+++ b/src/org.gluster.storage.management.gateway.scripts/.externalToolBuilders/org.python.pydev.PyDevBuilder.launch
diff --git a/src/com.gluster.storage.management.gateway.scripts/.project b/src/org.gluster.storage.management.gateway.scripts/.project
index bc0ebd63..46369752 100644
--- a/src/com.gluster.storage.management.gateway.scripts/.project
+++ b/src/org.gluster.storage.management.gateway.scripts/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.gateway.scripts</name>
+	<name>org.gluster.storage.management.gateway.scripts</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/DiskUtils.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/DiskUtils.py
index 4d1b701a..6666707b 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/DiskUtils.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/DiskUtils.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/FsTabUtils.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/FsTabUtils.py
index 653d0dda..0bb328db 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/FsTabUtils.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/FsTabUtils.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py
index ff73af6f..711dfa22 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/NetworkUtils.py
@@ -1,5 +1,19 @@
 #  Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Storage Platform.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/VolumeUtils.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/VolumeUtils.py
index 5476e090..84bd3a7e 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/VolumeUtils.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/VolumeUtils.py
@@ -1,5 +1,19 @@
 #  Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Storage Platform.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/add_user_cifs.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/add_user_cifs.py
index 2e1a1574..30cd399b 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/add_user_cifs.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/add_user_cifs.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/clear_volume_directory.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/clear_volume_directory.py
index 374a7e9c..4c2ec112 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/clear_volume_directory.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/clear_volume_directory.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/create_volume_cifs.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/create_volume_cifs.py
index 5a27ab87..f3d6795a 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/create_volume_cifs.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/create_volume_cifs.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/delete_user_cifs.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/delete_user_cifs.py
index aeda989f..88c6ac63 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/delete_user_cifs.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/delete_user_cifs.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/delete_volume_cifs.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/delete_volume_cifs.py
index 572d819c..a25fc667 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/delete_volume_cifs.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/delete_volume_cifs.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/org.gluster.storage.management.gateway.scripts/src/backend/format_device.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/format_device.py
new file mode 100755
index 00000000..8b9edf0c
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/format_device.py
@@ -0,0 +1,122 @@
+#!/usr/bin/python
+#  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
+#
+
+import os
+import sys
+import stat
+p1 = os.path.abspath(os.path.dirname(sys.argv[0]))
+p2 = "%s/common" % os.path.dirname(p1)
+if not p1 in sys.path:
+    sys.path.append(p1)
+if not p2 in sys.path:
+    sys.path.append(p2)
+import Globals
+import Utils
+import DiskUtils
+
+SIZE_TB_16 = 17179869184L
+
+def main():
+    if Utils.runCommand("wget -t 1 -T 1 -q -O /dev/null %s" % Globals.AWS_WEB_SERVICE_URL) == 0:
+        sys.stderr.write("format device unsupported\n")
+        sys.exit(1)
+
+    if len(sys.argv) != 4:
+        sys.stderr.write("usage: %s FSTYPE MOUNT_POINT DEVICE_NAME\n" % os.path.basename(sys.argv[0]))
+        sys.exit(-1)
+
+    fsType = sys.argv[1]
+    mountPoint = sys.argv[2]
+    device = DiskUtils.getDevice(sys.argv[3])
+    deviceName = DiskUtils.getDeviceName(sys.argv[3])
+
+    if not os.path.exists(device):
+        sys.stderr.write("device %s not found\n" % sys.argv[3])
+        sys.exit(2)
+
+    try:
+        if not stat.S_ISBLK(os.stat(device).st_mode):
+            sys.stderr.write("%s is not a block device\n" % sys.argv[3])
+            sys.exit(3)
+    except OSError, e:
+        Utils.log("unable to get device %s mode: %s" % (device, str(e)))
+        sys.stderr.write("unable to get device %s mode\n" % sys.argv[3])
+        sys.exit(-2)
+
+    if fsType in ['ext3', 'ext4', 'ext4dev']:
+        deviceSize = DiskUtils.getProcPartitions()[deviceName]['Size']
+        if deviceSize >= SIZE_TB_16:
+            Utils.log("device %s, size %s is greater than %s size for fstype %s" % (device, deviceSize, SIZE_TB_16, fsType))
+            sys.stderr.write("size of device %s is unsupported for fstype %s\n" % (sys.argv[3], fsType))
+            sys.exit(4)
+
+    if DiskUtils.isDataDiskPartitionFormatted(device):
+        sys.stderr.write("device %s already formatted\n" % sys.argv[3])
+        sys.exit(5)
+
+    if os.path.exists(mountPoint):
+        if not os.path.isdir(mountPoint):
+            sys.stderr.write("mount point %s exists but not a directory" % mountPoint)
+            sys.exit(6)
+        procMounts = Utils.readFile("/proc/mounts")
+        if procMounts.find(" %s " % mountPoint) != -1:
+            sys.stderr.write("mount point %s already has a mount\n" % mountPoint)
+            sys.exit(7)
+        if procMounts.find(" %s/" % mountPoint) != -1:
+            sys.stderr.write("mount point %s has a submount\n" % mountPoint)
+            sys.exit(8)
+    else:
+        status = Utils.runCommand("mkdir -p %s" % mountPoint, output=True, root=True)
+        if status["Status"] != 0:
+            sys.stderr.write("failed to create mount point %s\n" % mountPoint)
+            sys.exit(9)
+
+    if fsType not in Utils.getFileSystemType():
+        sys.stderr.write("unsupported file system type %s\n" % fsType)
+        sys.exit(10)
+
+    deviceFormatLockFile = Utils.getDeviceFormatLockFile(device)
+    deviceFormatStatusFile = Utils.getDeviceFormatStatusFile(device)
+    deviceFormatOutputFile = Utils.getDeviceFormatOutputFile(device)
+
+    if os.path.exists(deviceFormatStatusFile):
+        Utils.log("format status file %s exists" % deviceFormatStatusFile)
+        line = Utils.readFile(deviceFormatStatusFile)
+        if not line:
+            sys.stderr.write("failed to read format status file %s\n" % deviceFormatStatusFile)
+            sys.exit(-3)
+        if line.strip().upper() == "COMPLETED":
+            sys.stderr.write("Device %s already formatted\n" % sys.argv[3])
+            sys.exit(11)
+        else:
+            sys.stderr.write("Formatting device %s already running\n" % sys.argv[3])
+            sys.exit(12)
+
+    if os.path.exists(deviceFormatLockFile):
+        Utils.log("lock file %s exists" % deviceFormatLockFile)
+        sys.stderr.write("Formatting device %s already running\n" % sys.argv[3])
+        sys.exit(13)
+
+    command = ["%s/format_device_background.py" % p1, fsType, mountPoint, sys.argv[3]]
+    Utils.runCommandBG(command)
+    sys.exit(0)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/src/org.gluster.storage.management.gateway.scripts/src/backend/format_device_background.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/format_device_background.py
new file mode 100755
index 00000000..77314ef2
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/format_device_background.py
@@ -0,0 +1,142 @@
+#!/usr/bin/python
+#  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
+#
+
+import os
+import sys
+p1 = os.path.abspath(os.path.dirname(sys.argv[0]))
+p2 = "%s/common" % os.path.dirname(p1)
+if not p1 in sys.path:
+    sys.path.append(p1)
+if not p2 in sys.path:
+    sys.path.append(p2)
+import Utils
+import FsTabUtils
+import DiskUtils
+
+def writeStatus(deviceFormatStatusFile, message):
+    try:
+        fp = open(deviceFormatStatusFile, "w")
+        fp.write(message)
+        fp.close()
+    except IOError, e:
+        Utils.log("Failed to update log file %s: %s" % (deviceFormatStatusFile, str(e)))
+        return False
+    return True
+
+def main():
+    if len(sys.argv) != 4:
+        sys.stderr.write("usage: %s FSTYPE MOUNT_POINT DEVICE_NAME\n" % os.path.basename(sys.argv[0]))
+        sys.exit(-1)
+
+    fsType = sys.argv[1]
+    mountPoint = sys.argv[2]
+    device = DiskUtils.getDevice(sys.argv[3])
+
+    deviceFormatLockFile = Utils.getDeviceFormatLockFile(device)
+    deviceFormatStatusFile = Utils.getDeviceFormatStatusFile(device)
+    deviceFormatOutputFile = Utils.getDeviceFormatOutputFile(device)
+
+    if os.path.exists(deviceFormatStatusFile):
+        Utils.log("device format status file %s exists" % deviceFormatStatusFile)
+        sys.exit(1)
+
+    if os.path.exists(deviceFormatLockFile):
+        Utils.log("device format lock file %s exists" % deviceFormatLockFile)
+        sys.exit(2)
+
+    try:
+        fp = open(deviceFormatLockFile, "w")
+        fp.close()
+    except OSError, e:
+        Utils.log("failed to create lock file %s: %s" % (deviceFormatLockFile, str(e)))
+        writeStatus(deviceFormatStatusFile, "Lock file creation failed\n")
+        sys.exit(-2)
+
+    try:
+        fptr = open(deviceFormatOutputFile, 'w')
+    except IOError, e:
+        Utils.log("failed to create output file %s" % deviceFormatOutputFile)
+        writeStatus(deviceFormatStatusFile, "Output file creation failed\n")
+        Utils.removeFile(deviceFormatLockFile)
+        sys.exit(-3)
+
+    if fsType in ['ext3', 'ext4', 'ext4dev']:
+        command = "/sbin/mkfs.%s -F -I 512 %s" % (fsType, device)
+    elif fsType == "xfs":
+        command = "/sbin/mkfs.%s -f -i size=512 %s" % (fsType, device)
+    else:
+        command = "/sbin/mkfs.%s %s" % (fsType, device)
+
+    status = Utils.runCommand(command, output=True, root=True)
+    if status["Status"] != 0:
+        Utils.removeFile(deviceFormatOutputFile)
+        Utils.removeFile(deviceFormatLockFile)
+        writeStatus(deviceFormatStatusFile, "Device format failed\n")
+        sys.exit(3)
+
+    if Utils.runCommand("udevadm trigger") != 0:
+        Utils.log("failed running udevadm trigger")
+
+    if Utils.runCommand("/usr/bin/lshal") != 0:
+        Utils.log("failed running /usr/bin/lshal")
+
+    deviceUuid = DiskUtils.getUuidByDiskPartition(device)
+    if not deviceUuid:
+        Utils.removeFile(deviceFormatOutputFile)
+        Utils.removeFile(deviceFormatLockFile)
+        Utils.log("UUID not found after device %s formatted" % device)
+        writeStatus(deviceFormatStatusFile, "UUID not found after device %s formatted\n" % sys.argv[3])
+        sys.exit(4)
+
+    if DiskUtils.isDataDiskPartitionFormatted(device):
+        Utils.removeFile(deviceFormatOutputFile)
+        Utils.removeFile(deviceFormatLockFile)
+        Utils.log("UUID device %s already has an entry in fstab" % device)
+        writeStatus(deviceFormatStatusFile, "UUID device %s already has an entry in fstab\n" % sys.argv[3])
+        sys.exit(5)
+
+    newFsTabEntry = {"Device" : "UUID=%s" % deviceUuid,
+                     "MountPoint" : mountPoint,
+                     "FsType" : fsType,
+                     "Options" : "defaults",
+                     "DumpOption" : "0",
+                     "fsckOrder" : "2"}
+    if fsType in ['ext3', 'ext4', 'ext4dev']:
+        newFsTabEntry["Options"] = "defaults,user_xattr"
+    if not FsTabUtils.addFsTabEntry(newFsTabEntry):
+        Utils.removeFile(deviceFormatOutputFile)
+        Utils.removeFile(deviceFormatLockFile)
+        writeStatus(deviceFormatStatusFile, "failed to update fstab")
+        sys.exit(6)
+
+    status = Utils.runCommand("mount %s" % mountPoint, output=True, root=True)
+    if status["Status"] != 0:
+        Utils.removeFile(deviceFormatOutputFile)
+        Utils.removeFile(deviceFormatLockFile)
+        Utils.log("Mounting device %s on %s failed" % (device, mountPoint))
+        writeStatus(deviceFormatStatusFile, "Mounting device %s on %s failed\n" % (sys.argv[3], mountPoint))
+        sys.exit(7)
+
+    writeStatus(deviceFormatStatusFile, "Completed\n")
+    Utils.removeFile(deviceFormatOutputFile)
+    Utils.removeFile(deviceFormatLockFile)
+    sys.exit(0)
+
+if __name__ == "__main__":
+    main()
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_brick_status.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_brick_status.py
index b72321d7..0f5ca578 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_brick_status.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_brick_status.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Console.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/org.gluster.storage.management.gateway.scripts/src/backend/get_filesystem_type.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_filesystem_type.py
new file mode 100755
index 00000000..ce4daa4d
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_filesystem_type.py
@@ -0,0 +1,36 @@
+#!/usr/bin/python
+#  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
+#
+
+import os
+import sys
+p1 = os.path.abspath(os.path.dirname(sys.argv[0]))
+p2 = "%s/common" % os.path.dirname(p1)
+if not p1 in sys.path:
+    sys.path.append(p1)
+if not p2 in sys.path:
+    sys.path.append(p2)
+import Utils
+
+SUPPORTED_FSTYPE = ['ext3', 'ext4', 'ext4dev', 'xfs']
+
+def main():
+    print "\n".join(list(set(Utils.getFileSystemType()).intersection(set(SUPPORTED_FSTYPE))))
+
+if __name__ == "__main__":
+    main()
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_format_device_status.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_format_device_status.py
index 532f1585..0d965229 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_format_device_status.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_format_device_status.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Storage Platform.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_cpu_details.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_rrd_cpu_details.py
index da08fde1..219faa4f 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_cpu_details.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_rrd_cpu_details.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_memory_details.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_rrd_memory_details.py
index 07a9d7d0..04453628 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_memory_details.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_rrd_memory_details.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_net_details.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_rrd_net_details.py
index ee28ca13..258a758c 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_rrd_net_details.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_rrd_net_details.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
index be1e38e6..956a9e44 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_server_details.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Storage Platform.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
@@ -146,6 +160,8 @@ def getDiskDom():
             diskTag.appendChild(diskDom.createTag("type", "BOOT"))
         elif "UNINITIALIZED" == status:
             diskTag.appendChild(diskDom.createTag("type", "UNKNOWN"))
+        elif "swap" == value["FsType"]:
+            diskTag.appendChild(diskDom.createTag("type", "SWAP"))
         else:
             diskTag.appendChild(diskDom.createTag("type", "DATA"))
         diskTag.appendChild(diskDom.createTag("fsType", value["FsType"]))
@@ -163,9 +179,15 @@ def getDiskDom():
             partitionTag.appendChild(diskDom.createTag("name", partName))
             partitionTag.appendChild(diskDom.createTag("uuid", partValues["Uuid"]))
             partitionTag.appendChild(diskDom.createTag("fsType", partValues["FsType"]))
-            if partValues["FsType"]:
+            if partValues["MountPoint"] and partValues["MountPoint"] in ["/", "/boot"]:
                 partitionTag.appendChild(diskDom.createTag("status", "INITIALIZED"))
-                partitionTag.appendChild(diskDom.createTag("type", "DATA"))
+                partitionTag.appendChild(diskDom.createTag("type", "BOOT"))
+            elif partValues["FsType"]:
+                partitionTag.appendChild(diskDom.createTag("status", "INITIALIZED"))
+                if "swap" == partValues["FsType"]:
+                    partitionTag.appendChild(diskDom.createTag("type", "SWAP"))
+                else:
+                    partitionTag.appendChild(diskDom.createTag("type", "DATA"))
             else:
                 partitionTag.appendChild(diskDom.createTag("status", "UNINITIALIZED"))
                 partitionTag.appendChild(diskDom.createTag("type", "UNKNOWN"))
diff --git a/src/org.gluster.storage.management.gateway.scripts/src/backend/get_server_status.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_server_status.py
new file mode 100755
index 00000000..72627bd1
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_server_status.py
@@ -0,0 +1,42 @@
+#!/usr/bin/python
+#  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
+#
+
+import os
+import sys
+p1 = os.path.abspath(os.path.dirname(sys.argv[0]))
+p2 = "%s/common" % os.path.dirname(p1)
+if not p1 in sys.path:
+    sys.path.append(p1)
+if not p2 in sys.path:
+    sys.path.append(p2)
+import Utils
+
+def main():
+    if len(sys.argv) != 1:
+        sys.stderr.write("usage: %s\n" % os.path.basename(sys.argv[0]))
+        sys.exit(-1)
+
+    if Utils.runCommand("pidof glusterd") == 0:
+        print "ONLINE"
+    else:
+        print "OFFLINE"
+    sys.exit(0)
+
+if __name__ == "__main__":
+    main()
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_volume_brick_log.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_volume_brick_log.py
index 026c3c00..7a7904b9 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/get_volume_brick_log.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/get_volume_brick_log.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Storage Platform.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import re
diff --git a/src/org.gluster.storage.management.gateway.scripts/src/backend/gluster-volume-settings.init.d b/src/org.gluster.storage.management.gateway.scripts/src/backend/gluster-volume-settings.init.d
new file mode 100755
index 00000000..2afdfb4c
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/gluster-volume-settings.init.d
@@ -0,0 +1,36 @@
+#!/bin/bash
+#  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
+#
+# chkconfig: - 90 10
+### BEGIN INIT INFO
+# Required-Start: $network syslog glusterd
+# Default-Start:  3 5
+# Description: Setup/cleanup CIFS settings of Gluster volumes
+### END INIT INFO
+
+case "$1" in
+    start)
+	modprobe -q fuse
+	sleep 3
+	if ! lsmod | grep -qw fuse; then
+	    echo "FATAL: fuse kernel module is not found.  Gluster CIFS volume access will not work" >&2
+	    exit 1
+	fi
+	/usr/sbin/gluster_cifs_volume_startup
+	;;
+esac
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster_cifs_volume_startup.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/gluster_cifs_volume_startup.py
index 9ea7e021..2dfb1546 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/gluster_cifs_volume_startup.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/gluster_cifs_volume_startup.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/modify_volume_cifs.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/modify_volume_cifs.py
index d56b1f59..9e1e581c 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/modify_volume_cifs.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/modify_volume_cifs.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/multicast-discoverd.init.d b/src/org.gluster.storage.management.gateway.scripts/src/backend/multicast-discoverd.init.d
index 7cfbe44a..8bc881f8 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/multicast-discoverd.init.d
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/multicast-discoverd.init.d
@@ -1,6 +1,20 @@
 #!/bin/bash
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 # chkconfig: - 85 15
 # description: multicast discovery service
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/multicast-discoverd.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/multicast-discoverd.py
index cb5de70c..64236bbe 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/multicast-discoverd.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/multicast-discoverd.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_cpu.pl b/src/org.gluster.storage.management.gateway.scripts/src/backend/rrd_cpu.pl
index 30a66342..7b2ba99a 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_cpu.pl
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/rrd_cpu.pl
@@ -1,4 +1,22 @@
 #!/usr/bin/perl
+#*******************************************************************************
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Gateway.
+#
+# Gluster Management Gateway 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.
+#
+# Gluster Management Gateway 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/>.
+#*******************************************************************************
 
 use RRDs;
 
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_mem.pl b/src/org.gluster.storage.management.gateway.scripts/src/backend/rrd_mem.pl
index 5c47cd81..39c4d92e 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_mem.pl
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/rrd_mem.pl
@@ -1,4 +1,22 @@
 #!/usr/bin/perl
+#*******************************************************************************
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Gateway.
+#
+# Gluster Management Gateway 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.
+#
+# Gluster Management Gateway 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/>.
+#*******************************************************************************
 
 use RRDs;
 
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_net.pl b/src/org.gluster.storage.management.gateway.scripts/src/backend/rrd_net.pl
index 6ae128fd..c5b5428f 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/rrd_net.pl
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/rrd_net.pl
@@ -1,4 +1,22 @@
 #!/usr/bin/perl
+#*******************************************************************************
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Gateway.
+#
+# Gluster Management Gateway 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.
+#
+# Gluster Management Gateway 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/>.
+#*******************************************************************************
 
 use RRDs;
 
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/setup_cifs_config.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/setup_cifs_config.py
index 5d5187f4..62e031fd 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/setup_cifs_config.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/setup_cifs_config.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/start_volume_cifs.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/start_volume_cifs.py
index e16c87c2..45d239e1 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/start_volume_cifs.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/start_volume_cifs.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/stop_volume_cifs.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/stop_volume_cifs.py
index d67d9061..6bf736b9 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/stop_volume_cifs.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/stop_volume_cifs.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/org.gluster.storage.management.gateway.scripts/src/backend/update-rrd.sh b/src/org.gluster.storage.management.gateway.scripts/src/backend/update-rrd.sh
new file mode 100755
index 00000000..679a3a31
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/update-rrd.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+#*******************************************************************************
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Gateway.
+#
+# Gluster Management Gateway 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.
+#
+# Gluster Management Gateway 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/>.
+#*******************************************************************************
+
+/usr/bin/rrd_cpu.pl &
+/usr/bin/rrd_mem.pl &
+/usr/bin/rrd_net.pl &
+wait
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/backend/update_volume_cifs.py b/src/org.gluster.storage.management.gateway.scripts/src/backend/update_volume_cifs.py
index 64297a87..8544ac5c 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/backend/update_volume_cifs.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/backend/update_volume_cifs.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/common/Globals.py b/src/org.gluster.storage.management.gateway.scripts/src/common/Globals.py
index 49a12b69..f03e9feb 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/common/Globals.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/common/Globals.py
@@ -1,5 +1,19 @@
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Storage Platform.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 MULTICAST_GROUP = '224.224.1.1'
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py b/src/org.gluster.storage.management.gateway.scripts/src/common/Utils.py
index fc9bac5d..597f3fb6 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/common/Utils.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/common/Utils.py
@@ -1,5 +1,19 @@
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
@@ -15,6 +29,7 @@ import syslog
 import subprocess
 import time
 import tempfile
+import glob
 
 import Globals
 
@@ -28,7 +43,7 @@ sshCommandPrefix = "ssh -l root -q -i /opt/glustermg/keys/gluster.pem -o BatchMo
 try:
     commandPath = "/opt/glustermg/%s/backend" % os.environ['GMG_VERSION']
 except KeyError, e:
-    commandPath = "/opt/glustermg/1.0.0/backend"
+    commandPath = "/opt/glustermg/@VERSION@/backend"
 
 def log(priority, message=None):
     global logOpened
@@ -323,3 +338,6 @@ def grun(serverFile, command, argumentList=[]):
         return 0
     else:
         return 2
+
+def getFileSystemType():
+    return [os.path.basename(i).split('.')[1] for i in glob.glob("/sbin/mkfs.*")]
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/common/XmlHandler.py b/src/org.gluster.storage.management.gateway.scripts/src/common/XmlHandler.py
index d55ef07a..0d491a68 100644
--- a/src/com.gluster.storage.management.gateway.scripts/src/common/XmlHandler.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/common/XmlHandler.py
@@ -1,5 +1,19 @@
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import xml
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py
index adfd031c..bb17d4b5 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
@@ -63,7 +77,7 @@ def main():
         existingUser = True
 
     print (serverFile, uid, userName, password)
-    rv = Utils.grun(serverFile, "add_user_cifs.py", [uid, userName, password])
+    rv = Utils.grun(serverFile, "add_user_cifs.py", ["%s" % uid, userName, password])
     if existingUser:
         sys.exit(rv)
 
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/create_volume_cifs_all.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/create_volume_cifs_all.py
index 8a43e7dc..2c40a56b 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/create_volume_cifs_all.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/create_volume_cifs_all.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/delete_user_cifs_all.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/delete_user_cifs_all.py
index a86e7264..92192d69 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/delete_user_cifs_all.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/delete_user_cifs_all.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/delete_volume_cifs_all.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/delete_volume_cifs_all.py
index 925a3548..0f4e7fb5 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/delete_volume_cifs_all.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/delete_volume_cifs_all.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/get_volume_user_cifs.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/get_volume_user_cifs.py
index c072a556..bbe736e1 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/get_volume_user_cifs.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/get_volume_user_cifs.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/org.gluster.storage.management.gateway.scripts/src/gateway/gmg-reset-password.sh b/src/org.gluster.storage.management.gateway.scripts/src/gateway/gmg-reset-password.sh
new file mode 100755
index 00000000..626300b0
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/gmg-reset-password.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+#*******************************************************************************
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Gateway.
+#
+# Gluster Management Gateway 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.
+#
+# Gluster Management Gateway 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/>.
+#*******************************************************************************
+
+#-----------------------------------------------------------------------------------
+# gmg-reset-password.sh - script to reset password of given user to default password
+#-----------------------------------------------------------------------------------
+
+USAGE_ERR=1
+
+if [ $# -ne 1 ]; then
+	echo "Usage: ${0} <username>"
+	echo
+	exit ${USAGE_ERR}
+fi
+
+CURR_DIR=${PWD}
+SCRIPT_PATH=`readlink -f ${0}`
+GLUSTERMG_DIR=`dirname ${SCRIPT_PATH}`
+
+# Main action body
+cd ${GLUSTERMG_DIR}
+cd ..
+for FILE in WEB-INF/lib/*.jar
+do
+	export CLASSPATH=${CLASSPATH}:${PWD}/${FILE}
+done
+export CLASSPATH=${PWD}/WEB-INF/classes:${CLASSPATH}
+cd ${CURR_DIR}
+java org.gluster.storage.management.gateway.utils.PasswordManager reset ${1}
diff --git a/src/org.gluster.storage.management.gateway.scripts/src/gateway/grun.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/grun.py
new file mode 100755
index 00000000..d7c23ee8
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/grun.py
@@ -0,0 +1,35 @@
+#!/usr/bin/python
+#  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
+#
+
+import os
+import sys
+p1 = os.path.abspath(os.path.dirname(sys.argv[0]))
+p2 = "%s/common" % os.path.dirname(p1)
+if not p1 in sys.path:
+    sys.path.append(p1)
+if not p2 in sys.path:
+    sys.path.append(p2)
+import Utils
+
+
+if len(sys.argv) < 3:
+    sys.stderr.write("usage: %s SERVER_FILE COMMAND [ARGUMENTS]\n" % os.path.basename(sys.argv[0]))
+    sys.exit(-1)
+
+sys.exit(Utils.grun(sys.argv[1], sys.argv[2], sys.argv[3:]))
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/multicast-discover-servers.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/multicast-discover-servers.py
index ded207c0..9bdb037d 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/multicast-discover-servers.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/multicast-discover-servers.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 # 
 
 import os
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/remove_server_volume_cifs_config.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/remove_server_volume_cifs_config.py
index 27fb9b92..93c47af6 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/remove_server_volume_cifs_config.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/remove_server_volume_cifs_config.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/org.gluster.storage.management.gateway.scripts/src/gateway/setup_cifs_config_all.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/setup_cifs_config_all.py
new file mode 100755
index 00000000..99a4b2d3
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/setup_cifs_config_all.py
@@ -0,0 +1,43 @@
+#!/usr/bin/python
+#  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
+#
+
+import os
+import sys
+p1 = os.path.abspath(os.path.dirname(sys.argv[0]))
+p2 = "%s/common" % os.path.dirname(p1)
+if not p1 in sys.path:
+    sys.path.append(p1)
+if not p2 in sys.path:
+    sys.path.append(p2)
+import Utils
+
+
+def main():
+    if len(sys.argv) < 2:
+        sys.stderr.write("usage: %s SERVER_FILE\n" % os.path.basename(sys.argv[0]))
+        sys.exit(-1)
+
+    serverFile = sys.argv[1]
+
+    rv = Utils.grun(serverFile, "setup_cifs_config.py")
+    sys.exit(rv)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/src/com.gluster.storage.management.gateway.scripts/src/gateway/update_volume_cifs_all.py b/src/org.gluster.storage.management.gateway.scripts/src/gateway/update_volume_cifs_all.py
index e5576c45..07c1e90e 100755
--- a/src/com.gluster.storage.management.gateway.scripts/src/gateway/update_volume_cifs_all.py
+++ b/src/org.gluster.storage.management.gateway.scripts/src/gateway/update_volume_cifs_all.py
@@ -1,6 +1,20 @@
 #!/usr/bin/python
 #  Copyright (C) 2011 Gluster, Inc. <http://www.gluster.com>
-#  This file is part of Gluster Management Gateway.
+#  This file is part of Gluster Management Gateway (GlusterMG).
+#
+#  GlusterMG 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.
+#
+#  GlusterMG 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/>.
 #
 
 import os
diff --git a/src/com.gluster.storage.management.gateway/.classpath b/src/org.gluster.storage.management.gateway/.classpath
index 107e139d..894a6c4d 100644
--- a/src/com.gluster.storage.management.gateway/.classpath
+++ b/src/org.gluster.storage.management.gateway/.classpath
@@ -8,8 +8,7 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/com.gluster.storage.management.core"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/org.gluster.storage.management.core"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry exported="true" kind="lib" path="/com.gluster.storage.management.client/lib/jersey-1.5/jersey-multipart-1.5.jar"/>
 	<classpathentry kind="output" path="WebContent/WEB-INF/classes"/>
 </classpath>
diff --git a/src/com.gluster.storage.management.gateway/.project b/src/org.gluster.storage.management.gateway/.project
index 83fea45d..7a4356d5 100644
--- a/src/com.gluster.storage.management.gateway/.project
+++ b/src/org.gluster.storage.management.gateway/.project
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>com.gluster.storage.management.gateway</name>
+	<name>org.gluster.storage.management.gateway</name>
 	<comment></comment>
 	<projects>
+		<project>org.gluster.storage.management.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>
diff --git a/src/com.gluster.storage.management.gateway/.settings/.jsdtscope b/src/org.gluster.storage.management.gateway/.settings/.jsdtscope
index 3a28de0c..3a28de0c 100644
--- a/src/com.gluster.storage.management.gateway/.settings/.jsdtscope
+++ b/src/org.gluster.storage.management.gateway/.settings/.jsdtscope
diff --git a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.core.resources.prefs b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.core.resources.prefs
index d159aeca..d159aeca 100644
--- a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.core.resources.prefs
+++ b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.core.resources.prefs
diff --git a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.jdt.core.prefs b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.jdt.core.prefs
index 476db350..476db350 100644
--- a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.jdt.core.prefs
+++ b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.jdt.core.prefs
diff --git a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.ltk.core.refactoring.prefs b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.ltk.core.refactoring.prefs
index 5d9c71b6..5d9c71b6 100644
--- a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.ltk.core.refactoring.prefs
diff --git a/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.component b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.component
new file mode 100644
index 00000000..f3385657
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.component
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="org.gluster.storage.management.gateway">
+        <wb-resource deploy-path="/" source-path="/WebContent"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+        <dependent-module archiveName="org.gluster.storage.management.core.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/org.gluster.storage.management.core/org.gluster.storage.management.core">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <property name="java-output-path" value="/org.gluster.storage.management.gateway/build/classes"/>
+        <property name="context-root" value="glustermg"/>
+    </wb-module>
+</project-modules>
diff --git a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.project.facet.core.xml b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.project.facet.core.xml
index 8f960f27..8f960f27 100644
--- a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.container b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.container
index 3bd5d0a4..3bd5d0a4 100644
--- a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.container
+++ b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.container
diff --git a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.name b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.name
index 05bd71b6..05bd71b6 100644
--- a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.name
+++ b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.jsdt.ui.superType.name
diff --git a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.ws.service.policy.prefs b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.ws.service.policy.prefs
index e5ca6272..e5ca6272 100644
--- a/src/com.gluster.storage.management.gateway/.settings/org.eclipse.wst.ws.service.policy.prefs
+++ b/src/org.gluster.storage.management.gateway/.settings/org.eclipse.wst.ws.service.policy.prefs
diff --git a/src/org.gluster.storage.management.gateway/WebContent/META-INF/MANIFEST.MF b/src/org.gluster.storage.management.gateway/WebContent/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..5e949512
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/WebContent/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0

+Class-Path: 

+

diff --git a/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/Jersey-LICENSE.txt b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/Jersey-LICENSE.txt
new file mode 100644
index 00000000..d24fbfdb
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/Jersey-LICENSE.txt
@@ -0,0 +1,135 @@
+The GNU General Public License (GPL) Version 2, June 1991
+
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) 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 this service 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 make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. 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.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
+
+The precise terms and conditions for copying, distribution and modification follow.
+
+
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+   a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change.
+
+   b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License.
+
+   c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
+
+   a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+   b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or,
+
+   c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
+
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
+
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), 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 distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the 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 a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
+
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE 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.
+
+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 convey 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)
+
+   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 2 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, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
+
+   Gnomovision version 69, Copyright (C) year name of author
+   Gnomovision 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, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
+
+   Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+   signature of Ty Coon, 1 April 1989
+   Ty Coon, President of Vice
+
+This 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 Library General Public License instead of this License.
+
+
+"CLASSPATH" EXCEPTION TO THE GPL VERSION 2
+
+Certain source files distributed by Oracle are subject to the following clarification and special exception to the GPL Version 2, but only where Oracle has expressly included in the particular source file's header the words "Oracle designates this particular file as subject to the "Classpath" exception as provided by Oracle in the License file that accompanied this code."
+
+Linking this library statically or dynamically with other modules is making a combined work based on this library.  Thus, the terms and conditions of the GNU General Public License Version 2 cover the whole combination.
+
+As a special exception, the copyright holders of this library give you permission to link this library with independent modules to produce an executable, regardless of the license terms of these independent modules, and to copy and distribute the resulting executable under terms of your choice, provided that you also meet, for each linked independent module, the terms and conditions of the license of that module.  An independent module is a module which is not derived from or based on this library.  If you modify this library, you may extend this exception to your version of the library, but you are not obligated to do so.  If you do not wish to do so, delete this exception statement from your version.
diff --git a/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/Jersey-third-party-license-readme.txt b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/Jersey-third-party-license-readme.txt
new file mode 100644
index 00000000..b3acf520
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/Jersey-third-party-license-readme.txt
@@ -0,0 +1,188 @@
+
+DO NOT TRANSLATE OR LOCALIZE.
+
+%% The following software may be included in this product: ASM
+ Use of any of this software is governed by the terms of the license below:
+
+Copyright (c) 2000-2005 INRIA, France Telecom
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holders nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+THE POSSIBILITY OF SUCH DAMAGE.
+
+
+%% The following software may be included in this product: Jettison
+ Use of any of this software is governed by the terms of the license below:
+
+
+Copyright 2006 Envoi Solutions LLC
+
+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.
+
+--------------------------------------------------------------------------
+
+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:
+
+   1. You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+   2. You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+   3. 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
+
+   4. 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.
+
+
+
+%% The following software may be included in this product: Jackson
+ Use of any of this software is governed by the terms of the license below:
+
+
+Jackson is dual-licensed under two alternative popular Open Source licenses: Apache (AL 2.0) and Gnu Lesser GPL (LGPL 2.1). You choose one or the other, as necessary (if you want to redistribute the code ¿ for use, you do not need license), and abide by the license rules as defined by the respective license agreement (and only that one).
+
+--------------------------------------------------------------------------
+
+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:
+
+   1. You must give any other recipients of the Work or Derivative Works a copy of this License; and
+
+   2. You must cause any modified files to carry prominent notices stating that You changed the files; and
+
+   3. 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
+
+   4. 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/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/antlr-2.7.6.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/antlr-2.7.6.jar
index 3702b645..3702b645 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/antlr-2.7.6.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/antlr-2.7.6.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/aopalliance-1.0.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/aopalliance-1.0.jar
index 578b1a0c..578b1a0c 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/aopalliance-1.0.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/aopalliance-1.0.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/asm-3.1.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/asm-3.1.jar
index 8217cae0..8217cae0 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/asm-3.1.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/asm-3.1.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-collections-3.1.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-collections-3.1.jar
index 41e230fe..41e230fe 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-collections-3.1.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-collections-3.1.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar
index 8758a96b..8758a96b 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/commons-logging-1.1.1.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derby.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derby.jar
index dc8ae8df..dc8ae8df 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derby.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derby.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derbytools.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derbytools.jar
index ca367aae..ca367aae 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derbytools.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/derbytools.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/dom4j-1.6.1.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/dom4j-1.6.1.jar
index c8c4dbb9..c8c4dbb9 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/dom4j-1.6.1.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/dom4j-1.6.1.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250-LICENSE.txt b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250-LICENSE.txt
index 3eddd42f..3eddd42f 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250-LICENSE.txt
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250-LICENSE.txt
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250.jar
index c0a9ac7b..c0a9ac7b 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/ganymed-ssh2-build250.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar
index 4c9ac4e9..4c9ac4e9 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate-jpa-2.0-api-1.0.0.Final.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate3.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate3.jar
index c1c81141..c1c81141 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate3.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/hibernate3.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-core-asl-1.5.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-core-asl-1.5.5.jar
index a3248188..a3248188 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-core-asl-1.5.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-core-asl-1.5.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-jaxrs-1.5.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-jaxrs-1.5.5.jar
index faf12cf6..faf12cf6 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-jaxrs-1.5.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-jaxrs-1.5.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-mapper-asl-1.5.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-mapper-asl-1.5.5.jar
index ca612580..ca612580 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-mapper-asl-1.5.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-mapper-asl-1.5.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-xc-1.5.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-xc-1.5.5.jar
index 57c2c670..57c2c670 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-xc-1.5.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jackson-xc-1.5.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/javassist-3.12.0.GA.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/javassist-3.12.0.GA.jar
index 8f692f4f..8f692f4f 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/javassist-3.12.0.GA.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/javassist-3.12.0.GA.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-client-1.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-client-1.5.jar
index 62f790fa..62f790fa 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-client-1.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-client-1.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-core-1.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-core-1.5.jar
index 92b38466..92b38466 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-core-1.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-core-1.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-json-1.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-json-1.5.jar
index 01d8c83b..01d8c83b 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-json-1.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-json-1.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-multipart-1.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-multipart-1.5.jar
index 1c134f05..1c134f05 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-multipart-1.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-multipart-1.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-server-1.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-server-1.5.jar
index a29d7409..a29d7409 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-server-1.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-server-1.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-spring-1.5.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-spring-1.5.jar
index c79b4490..c79b4490 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-spring-1.5.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jersey-spring-1.5.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jettison-1.1.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jettison-1.1.jar
index e4e9c8c3..e4e9c8c3 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jettison-1.1.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jettison-1.1.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jnlp-servlet.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jnlp-servlet.jar
index 23782c02..23782c02 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jnlp-servlet.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jnlp-servlet.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jsr311-api-1.1.1.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jsr311-api-1.1.1.jar
index ec8bc818..ec8bc818 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jsr311-api-1.1.1.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jsr311-api-1.1.1.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jta-1.1.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jta-1.1.jar
index 6d225b76..6d225b76 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jta-1.1.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/jta-1.1.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/log4j-1.2.16.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/log4j-1.2.16.jar
index 3f9d8476..3f9d8476 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/log4j-1.2.16.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/log4j-1.2.16.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/mimepull-1.3.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/mimepull-1.3.jar
index 48cc9295..48cc9295 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/mimepull-1.3.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/mimepull-1.3.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.eclipse.equinox.common_3.6.0.v20100503.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.eclipse.equinox.common_3.6.0.v20100503.jar
index a5d37aa1..a5d37aa1 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.eclipse.equinox.common_3.6.0.v20100503.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.eclipse.equinox.common_3.6.0.v20100503.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aop-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aop-3.0.5.RELEASE.jar
index db6f529f..db6f529f 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aop-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aop-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.asm-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.asm-3.0.5.RELEASE.jar
index 7cd3a626..7cd3a626 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.asm-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.asm-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aspects-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aspects-3.0.5.RELEASE.jar
index 11fc11b9..11fc11b9 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aspects-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.aspects-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.beans-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.beans-3.0.5.RELEASE.jar
index f2e2e927..f2e2e927 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.beans-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.beans-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context-3.0.5.RELEASE.jar
index bd1367d8..bd1367d8 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context.support-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context.support-3.0.5.RELEASE.jar
index e46f9eb8..e46f9eb8 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context.support-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.context.support-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.core-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.core-3.0.5.RELEASE.jar
index ea9500d6..ea9500d6 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.core-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.core-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.expression-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.expression-3.0.5.RELEASE.jar
index 6ef99d8d..6ef99d8d 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.expression-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.expression-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument-3.0.5.RELEASE.jar
index e149290e..e149290e 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument.tomcat-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument.tomcat-3.0.5.RELEASE.jar
index dcd1e4d9..dcd1e4d9 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument.tomcat-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.instrument.tomcat-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jdbc-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jdbc-3.0.5.RELEASE.jar
index f7a3b837..f7a3b837 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jdbc-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jdbc-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jms-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jms-3.0.5.RELEASE.jar
index 9cea2aef..9cea2aef 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jms-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.jms-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.orm-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.orm-3.0.5.RELEASE.jar
index d0550ccd..d0550ccd 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.orm-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.orm-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.oxm-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.oxm-3.0.5.RELEASE.jar
index 1688cf74..1688cf74 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.oxm-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.oxm-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.spring-library-3.0.5.RELEASE.libd b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.spring-library-3.0.5.RELEASE.libd
index b3aa6af8..b3aa6af8 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.spring-library-3.0.5.RELEASE.libd
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.spring-library-3.0.5.RELEASE.libd
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.test-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.test-3.0.5.RELEASE.jar
index 237995c5..237995c5 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.test-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.test-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.transaction-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.transaction-3.0.5.RELEASE.jar
index 2f52122b..2f52122b 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.transaction-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.transaction-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web-3.0.5.RELEASE.jar
index 5a2381a0..5a2381a0 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.portlet-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.portlet-3.0.5.RELEASE.jar
index 6ec9d681..6ec9d681 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.portlet-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.portlet-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.servlet-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.servlet-3.0.5.RELEASE.jar
index 6d13bd40..6d13bd40 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.servlet-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.servlet-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.struts-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.struts-3.0.5.RELEASE.jar
index e351ae7b..e351ae7b 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.struts-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/org.springframework.web.struts-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/servlet-api.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/servlet-api.jar
index e5bc672b..e5bc672b 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/servlet-api.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/servlet-api.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar
index f1f4fdd2..f1f4fdd2 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/slf4j-api-1.6.1.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-framework-3.0.5.RELEASE-LICENSE.txt b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-framework-3.0.5.RELEASE-LICENSE.txt
index 261eeb9e..261eeb9e 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-framework-3.0.5.RELEASE-LICENSE.txt
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-framework-3.0.5.RELEASE-LICENSE.txt
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-3.0.5.RELEASE-LICENSE.txt b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-3.0.5.RELEASE-LICENSE.txt
index 261eeb9e..261eeb9e 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-3.0.5.RELEASE-LICENSE.txt
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-3.0.5.RELEASE-LICENSE.txt
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-config-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-config-3.0.5.RELEASE.jar
index 78818fc5..78818fc5 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-config-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-config-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-core-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-core-3.0.5.RELEASE.jar
index a8077d5d..a8077d5d 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-core-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-core-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-web-3.0.5.RELEASE.jar b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-web-3.0.5.RELEASE.jar
index 26611b55..26611b55 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-web-3.0.5.RELEASE.jar
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/lib/spring-security-web-3.0.5.RELEASE.jar
diff --git a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml
index 750ef171..d2f2b742 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml
+++ b/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/web.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+    This file is part of Gluster Management Gateway.
+   
+    Gluster Management Gateway 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.
+   
+    Gluster Management Gateway 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/>.
+ -->
+
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
   <display-name>glustermg</display-name>
   <welcome-file-list>
@@ -23,24 +42,24 @@
     <listener-class>org.springframework.web.context.request.RequestContextListener</listener-class>
   </listener>
   <listener>
-  	<listener-class>com.gluster.storage.management.gateway.listeners.ShutdownListener</listener-class>
+    <listener-class>org.gluster.storage.management.gateway.listeners.ShutdownListener</listener-class>
   </listener>
   <servlet>
-    <servlet-name>gluster-resources-1.0</servlet-name>
+    <servlet-name>gluster-resources-@VERSION@</servlet-name>
     <servlet-class>com.sun.jersey.spi.spring.container.servlet.SpringServlet</servlet-class>
     <init-param>
       <param-name>com.sun.jersey.config.property.packages</param-name>
-      <param-value>com.gluster.storage.management.gateway.resources.v1_0</param-value>
+      <param-value>org.gluster.storage.management.gateway.resources.v1_0</param-value>
     </init-param>
     <init-param>
       <param-name>com.sun.jersey.spi.container.ResourceFilters</param-name>
-      <param-value>com.gluster.storage.management.gateway.filters.GlusterResourceFilterFactory</param-value>
+      <param-value>org.gluster.storage.management.gateway.filters.GlusterResourceFilterFactory</param-value>
     </init-param>
     <load-on-startup>1</load-on-startup>
   </servlet>
   <servlet-mapping>
-    <servlet-name>gluster-resources-1.0</servlet-name>
-    <url-pattern>/1.0.0/*</url-pattern>
+    <servlet-name>gluster-resources-@VERSION@</servlet-name>
+    <url-pattern>/@VERSION@/*</url-pattern>
   </servlet-mapping>
   <servlet>
     <servlet-name>JnlpDownloadServlet</servlet-name>
@@ -73,4 +92,4 @@
       <transport-guarantee>CONFIDENTIAL</transport-guarantee>
     </user-data-constraint>
   </security-constraint>
-</web-app>
\ No newline at end of file
+</web-app>
diff --git a/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/0-version.sql b/src/org.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/0-version.sql
index 4c3d81d1..4c3d81d1 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/0-version.sql
+++ b/src/org.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/0-version.sql
diff --git a/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/1-security-schema.sql b/src/org.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/1-security-schema.sql
index 4f61fc9d..4f61fc9d 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/1-security-schema.sql
+++ b/src/org.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/1-security-schema.sql
diff --git a/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/2-users-authorities-groups.sql b/src/org.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/2-users-authorities-groups.sql
index 5bd73813..5bd73813 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/2-users-authorities-groups.sql
+++ b/src/org.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/2-users-authorities-groups.sql
diff --git a/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/3-cluster-servers.sql b/src/org.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/3-cluster-servers.sql
index 17ca62d2..17ca62d2 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/3-cluster-servers.sql
+++ b/src/org.gluster.storage.management.gateway/WebContent/data/scripts/1.0.0/3-cluster-servers.sql
diff --git a/src/com.gluster.storage.management.gateway/WebContent/index.html b/src/org.gluster.storage.management.gateway/WebContent/index.html
index 5947cf11..5947cf11 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/index.html
+++ b/src/org.gluster.storage.management.gateway/WebContent/index.html
diff --git a/src/org.gluster.storage.management.gateway/WebContent/scripts/Globals.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/Globals.py
new file mode 120000
index 00000000..f46e07b0
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/Globals.py
@@ -0,0 +1 @@
+../../../org.gluster.storage.management.gateway.scripts/src/common/Globals.py
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.gateway/WebContent/scripts/Utils.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/Utils.py
new file mode 120000
index 00000000..c0c725ae
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/Utils.py
@@ -0,0 +1 @@
+../../../org.gluster.storage.management.gateway.scripts/src/common/Utils.py
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.gateway/WebContent/scripts/XmlHandler.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/XmlHandler.py
new file mode 120000
index 00000000..5eb6d29c
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/XmlHandler.py
@@ -0,0 +1 @@
+../../../org.gluster.storage.management.gateway.scripts/src/common/XmlHandler.py
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py
new file mode 120000
index 00000000..fe5d0823
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/add_user_cifs_all.py
@@ -0,0 +1 @@
+../../../org.gluster.storage.management.gateway.scripts/src/gateway/add_user_cifs_all.py
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py
new file mode 120000
index 00000000..51f0f6a0
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/create_volume_cifs_all.py
@@ -0,0 +1 @@
+../../../org.gluster.storage.management.gateway.scripts/src/gateway/create_volume_cifs_all.py
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.gateway/WebContent/scripts/delete_user_cifs_all.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/delete_user_cifs_all.py
new file mode 120000
index 00000000..a27da38d
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/delete_user_cifs_all.py
@@ -0,0 +1 @@
+../../../org.gluster.storage.management.gateway.scripts/src/gateway/delete_user_cifs_all.py
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py
new file mode 120000
index 00000000..6737ed13
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/delete_volume_cifs_all.py
@@ -0,0 +1 @@
+../../../org.gluster.storage.management.gateway.scripts/src/gateway/delete_volume_cifs_all.py
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.gateway/WebContent/scripts/get_volume_user_cifs.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/get_volume_user_cifs.py
new file mode 120000
index 00000000..a4ecd508
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/get_volume_user_cifs.py
@@ -0,0 +1 @@
+../../../org.gluster.storage.management.gateway.scripts/src/gateway/get_volume_user_cifs.py
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.gateway/WebContent/scripts/gmg-reset-password.sh b/src/org.gluster.storage.management.gateway/WebContent/scripts/gmg-reset-password.sh
new file mode 120000
index 00000000..a8834518
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/gmg-reset-password.sh
@@ -0,0 +1 @@
+../../../org.gluster.storage.management.gateway.scripts/src/gateway/gmg-reset-password.sh
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.gateway/WebContent/scripts/grun.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/grun.py
new file mode 120000
index 00000000..bf00f062
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/grun.py
@@ -0,0 +1 @@
+../../../org.gluster.storage.management.gateway.scripts/src/gateway/grun.py
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.gateway/WebContent/scripts/multicast-discover-servers.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/multicast-discover-servers.py
new file mode 120000
index 00000000..96d7a1fd
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/multicast-discover-servers.py
@@ -0,0 +1 @@
+../../../org.gluster.storage.management.gateway.scripts/src/gateway/multicast-discover-servers.py
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.gateway/WebContent/scripts/remove_server_volume_cifs_config.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/remove_server_volume_cifs_config.py
new file mode 120000
index 00000000..0edfd5b2
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/remove_server_volume_cifs_config.py
@@ -0,0 +1 @@
+../../../org.gluster.storage.management.gateway.scripts/src/gateway/remove_server_volume_cifs_config.py
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.gateway/WebContent/scripts/setup_cifs_config_all.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/setup_cifs_config_all.py
new file mode 120000
index 00000000..52960770
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/setup_cifs_config_all.py
@@ -0,0 +1 @@
+../../../org.gluster.storage.management.gateway.scripts/src/gateway/setup_cifs_config_all.py
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py b/src/org.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py
new file mode 120000
index 00000000..cfe64a58
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/WebContent/scripts/update_volume_cifs_all.py
@@ -0,0 +1 @@
+../../../org.gluster.storage.management.gateway.scripts/src/gateway/update_volume_cifs_all.py
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/WebContent/ssl/gmg-ssl.keystore b/src/org.gluster.storage.management.gateway/WebContent/ssl/gmg-ssl.keystore
index 2efe19b0..2efe19b0 100644
--- a/src/com.gluster.storage.management.gateway/WebContent/ssl/gmg-ssl.keystore
+++ b/src/org.gluster.storage.management.gateway/WebContent/ssl/gmg-ssl.keystore
diff --git a/src/com.gluster.storage.management.gateway/buckminster.cspex b/src/org.gluster.storage.management.gateway/buckminster.cspex
index 31eb9d67..4133dfcb 100644
--- a/src/com.gluster.storage.management.gateway/buckminster.cspex
+++ b/src/org.gluster.storage.management.gateway/buckminster.cspex
@@ -15,7 +15,7 @@
 	<actions>
 		<public name="archive" actor="ant">
 	      <actorProperties>
-	        <property key="buildFile" value="build/glusterserver.ant"/>
+	        <property key="buildFile" value="build/glustermg.ant"/>
 	      </actorProperties>
 	    </public>
 	</actions>
diff --git a/src/com.gluster.storage.management.gateway/build/glusterserver.ant b/src/org.gluster.storage.management.gateway/build/glustermg.ant
index 98120ba4..ac15e1bd 100644
--- a/src/com.gluster.storage.management.gateway/build/glusterserver.ant
+++ b/src/org.gluster.storage.management.gateway/build/glustermg.ant
@@ -1,6 +1,4 @@
-<project name="com.gluster.storage.management.gateway" basedir="." default="archive">
-	<echo message="basedir=${basedir}" />
-	<echo message="buckminster.output=${buckminster.output}" />
+<project name="org.gluster.storage.management.gateway" basedir="." default="archive">
 	<property name="WEB-INF" value="${basedir}/WebContent/WEB-INF" />
 	<property name="OUT" value="${buckminster.output}/glusterserver/" />
 	<property name="WAR_FILE_NAME" value="glustermg.war" />
@@ -59,6 +57,11 @@
 				<exclude name="**/servlet-api.jar" />
 			</fileset>
 		</copy>
+
+        <!-- Update product version in xml files -->
+		<replace file="${TEMP}/WEB-INF/web.xml" token="@VERSION@" value="${product.version}" />
+		<replace file="${TEMP}/WEB-INF/classes/spring/gluster-server-base.xml" token="@VERSION@" value="${product.version}" />
+
 		<war destfile="${OUT}/${WAR_FILE_NAME}" basedir="${TEMP}" compress="true" webxml="${TEMP}/WEB-INF/web.xml" />
 		<delete dir="${TEMP}" />
 	</target>
diff --git a/src/org.gluster.storage.management.gateway/src/META-INF/persistence.xml b/src/org.gluster.storage.management.gateway/src/META-INF/persistence.xml
new file mode 100644
index 00000000..276254ff
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/src/META-INF/persistence.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+    This file is part of Gluster Management Gateway.
+   
+    Gluster Management Gateway 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.
+   
+    Gluster Management Gateway 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/>.
+ -->
+
+<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
+	<persistence-unit name="gluster-management-gateway" transaction-type="RESOURCE_LOCAL" />
+</persistence>
\ No newline at end of file
diff --git a/src/org.gluster.storage.management.gateway/src/log4j.properties b/src/org.gluster.storage.management.gateway/src/log4j.properties
new file mode 100644
index 00000000..4b93b8f1
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/src/log4j.properties
@@ -0,0 +1,38 @@
+###############################################################################
+# Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+# This file is part of Gluster Management Gateway.
+#
+# Gluster Management Gateway 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.
+#
+# Gluster Management Gateway 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/>.
+###############################################################################
+log4j.rootLogger=INFO, R
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.immediateFlush=true
+log4j.appender.CONSOLE.target=System.out
+log4j.appender.CONSOLE.threshold=DEBUG
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{dd MMM, yyyy HH:mm:ss} %p: %c %t - %m%n
+
+log4j.appender.R=org.apache.log4j.RollingFileAppender 
+log4j.appender.R.File=/var/log/glustermg/glustermg.log 
+log4j.appender.R.MaxFileSize=10MB 
+log4j.appender.R.MaxBackupIndex=10 
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d{dd MMM, yyyy HH:mm:ss} %p: %c %t - %m%n 
+#log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n
+
+log4j.logger.org=ERROR
+log4j.logger.com=ERROR
+log4j.logger.org.gluster=DEBUG
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/ClusterInfo.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/ClusterInfo.java
index 3e5ea01a..4b6dbc9f 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/ClusterInfo.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/ClusterInfo.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.data;
+package org.gluster.storage.management.gateway.data;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -29,6 +29,7 @@ import javax.persistence.OneToMany;
 import org.hibernate.cfg.AnnotationConfiguration;
 import org.hibernate.tool.hbm2ddl.SchemaExport;
 
+@SuppressWarnings("deprecation")
 @Entity(name="cluster_info")
 public class ClusterInfo {
 	@Id
diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/GlusterDataSource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/GlusterDataSource.java
new file mode 100644
index 00000000..3d7ff2ad
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/GlusterDataSource.java
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
+ *
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.gateway.data;
+
+import javax.servlet.ServletContext;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.datasource.DriverManagerDataSource;
+import org.springframework.stereotype.Component;
+
+@Component
+public class GlusterDataSource extends DriverManagerDataSource {
+	@Autowired
+	ServletContext servletContext;
+	
+	public GlusterDataSource() {
+		setDriverClassName(org.apache.derby.jdbc.EmbeddedDriver.class.getName());
+
+		setUsername("gluster");
+		// TODO: change to a stronger (encrypted) password
+		setPassword("gluster");
+	}
+
+	public DriverManagerDataSource getDataSource() {
+		// Database directory = work/data relative to context root
+		setUrl("jdbc:derby:" + servletContext.getRealPath("data") + ";create=true");
+		
+		return this;
+	}
+}
\ No newline at end of file
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/PersistenceDao.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/PersistenceDao.java
index eb7d6514..f6a3b29b 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/PersistenceDao.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/PersistenceDao.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.data;
+package org.gluster.storage.management.gateway.data;
 
 import java.util.List;
 
@@ -83,18 +83,15 @@ public class PersistenceDao<T> {
 		return getEntityManager().find(type, id);
 	}
 
-	@SuppressWarnings("unchecked")
 	public List<T> findAll() {
 		return getEntityManager().createQuery("select t from " + type.getName() + " t").getResultList();
 	}
 
-	@SuppressWarnings("unchecked")
 	public List<T> findBy(String whereClause) {
 		return getEntityManager().createQuery("select t from " + type.getName() + " t where " + whereClause)
 				.getResultList();
 	}
 
-	@SuppressWarnings("unchecked")
 	public List<T> findBy(String whereClause, String... params) {
 		return createQuery("select t from " + type.getName() + " t where " + whereClause, params).getResultList();
 	}
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/ServerInfo.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/ServerInfo.java
index a3f8c920..5670b6f6 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/data/ServerInfo.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/data/ServerInfo.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.data;
+package org.gluster.storage.management.gateway.data;
 
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/AuditFilter.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/filters/AuditFilter.java
index f6702238..6b5a796f 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/AuditFilter.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/filters/AuditFilter.java
@@ -1,7 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
+ *
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
+ *******************************************************************************/
 /**
  * 
  */
-package com.gluster.storage.management.gateway.filters;
+package org.gluster.storage.management.gateway.filters;
 
 import java.security.Principal;
 
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/AuthenticationFailureFilter.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/filters/AuthenticationFailureFilter.java
index 73a1085e..1fbe3797 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/filters/AuthenticationFailureFilter.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/filters/AuthenticationFailureFilter.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.filters;
+package org.gluster.storage.management.gateway.filters;
 
 import java.io.CharArrayWriter;
 import java.io.IOException;
diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/filters/GlusterResourceFilterFactory.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/filters/GlusterResourceFilterFactory.java
new file mode 100644
index 00000000..e0fd7326
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/filters/GlusterResourceFilterFactory.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
+ *
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
+ *******************************************************************************/
+/**
+ * 
+ */
+package org.gluster.storage.management.gateway.filters;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.sun.jersey.api.model.AbstractMethod;
+import com.sun.jersey.spi.container.ResourceFilter;
+import com.sun.jersey.spi.container.ResourceFilterFactory;
+
+/**
+ * Gluster resource filter factory. As of now, this creates only one filter - the audit filter {@code AuditFilter}
+ */
+public class GlusterResourceFilterFactory implements ResourceFilterFactory {
+
+	public GlusterResourceFilterFactory() {
+	}
+	
+	/* (non-Javadoc)
+	 * @see com.sun.jersey.spi.container.ResourceFilterFactory#create(com.sun.jersey.api.model.AbstractMethod)
+	 */
+	@Override
+	public List<ResourceFilter> create(AbstractMethod arg0) {
+		List<ResourceFilter> filters = new ArrayList<ResourceFilter>();
+		filters.add(new AuditFilter());
+		
+		return filters;
+	}
+}
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/listeners/ShutdownListener.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/listeners/ShutdownListener.java
index 44b72252..33b35af6 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/listeners/ShutdownListener.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/listeners/ShutdownListener.java
@@ -1,27 +1,28 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.listeners;
+package org.gluster.storage.management.gateway.listeners;
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 
-import com.gluster.storage.management.gateway.utils.DBUtil;
+import org.gluster.storage.management.gateway.utils.DBUtil;
+
 
 /**
  * Shuts down the Derby database when gateway is being stopped.
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/AbstractResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/AbstractResource.java
index 9fc4fceb..a36f4164 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/AbstractResource.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/AbstractResource.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.resources.v1_0;
+package org.gluster.storage.management.gateway.resources.v1_0;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -45,7 +45,7 @@ public class AbstractResource {
 	 * @return the {@link Response} object
 	 */
 	protected Response createdResponse(String relativePath) {
-		return Response.created(createRelatriveURI(relativePath)).build();
+		return Response.created(createRelativeURI(relativePath)).build();
 	}
 
 	/**
@@ -94,7 +94,7 @@ public class AbstractResource {
 	 * @return the {@link Response} object
 	 */
 	protected Response noContentResponse(String location) {
-		return Response.noContent().location(createRelatriveURI(location)).build();
+		return Response.noContent().location(createRelativeURI(location)).build();
 	}
 
 	/**
@@ -102,7 +102,7 @@ public class AbstractResource {
 	 * @param location path relative to current URI
 	 * @return newly created URI
 	 */
-	protected URI createRelatriveURI(String location) {
+	protected URI createRelativeURI(String location) {
 		return uriInfo.getAbsolutePathBuilder().path(location).build();
 	}
 
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java
index d0da6696..7d41be41 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/ClustersResource.java
@@ -1,27 +1,27 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.resources.v1_0;
+package org.gluster.storage.management.gateway.resources.v1_0;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CLUSTER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_CLUSTER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CLUSTER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_CLUSTER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -37,13 +37,12 @@ import javax.ws.rs.Produces;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
-import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.exceptions.GlusterValidationException;
+import org.gluster.storage.management.core.response.ClusterNameListResponse;
+import org.gluster.storage.management.gateway.data.ClusterInfo;
+import org.gluster.storage.management.gateway.services.ClusterService;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.exceptions.GlusterValidationException;
-import com.gluster.storage.management.core.response.ClusterNameListResponse;
-import com.gluster.storage.management.gateway.data.ClusterInfo;
-import com.gluster.storage.management.gateway.services.ClusterService;
 import com.sun.jersey.api.core.InjectParam;
 import com.sun.jersey.spi.resource.Singleton;
 
@@ -56,10 +55,9 @@ import com.sun.jersey.spi.resource.Singleton;
 public class ClustersResource extends AbstractResource {
 	@InjectParam
 	private ClusterService clusterService;
-	private static final Logger logger = Logger.getLogger(ClustersResource.class);
 	
 	@GET
-	@Produces(MediaType.APPLICATION_XML)
+	@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
 	public ClusterNameListResponse getClusters() {
 		List<ClusterInfo> clusters = clusterService.getAllClusters();
 		List<String> clusterList = new ArrayList<String>();
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/DiscoveredServersResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/DiscoveredServersResource.java
index f47675d8..60e40d9f 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/DiscoveredServersResource.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/DiscoveredServersResource.java
@@ -1,26 +1,26 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.resources.v1_0;
+package org.gluster.storage.management.gateway.resources.v1_0;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_SERVER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DETAILS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_DISCOVERED_SERVERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_SERVER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DETAILS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_DISCOVERED_SERVERS;
 
 import java.util.List;
 
@@ -32,12 +32,12 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.response.ServerListResponse;
+import org.gluster.storage.management.core.response.ServerNameListResponse;
+import org.gluster.storage.management.gateway.services.DiscoveredServerService;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.response.ServerListResponse;
-import com.gluster.storage.management.core.response.ServerNameListResponse;
-import com.gluster.storage.management.gateway.services.DiscoveredServerService;
 import com.sun.jersey.api.core.InjectParam;
 import com.sun.jersey.spi.resource.Singleton;
 
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GenericExceptionMapper.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/GenericExceptionMapper.java
index fc9115da..ceb4bf7a 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GenericExceptionMapper.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/GenericExceptionMapper.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.resources.v1_0;
+package org.gluster.storage.management.gateway.resources.v1_0;
 
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
@@ -25,8 +25,7 @@ import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
 
 import org.apache.log4j.Logger;
-
-import com.gluster.storage.management.core.exceptions.GlusterValidationException;
+import org.gluster.storage.management.core.exceptions.GlusterValidationException;
 
 @Provider
 public class GenericExceptionMapper implements ExceptionMapper<Exception> {
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
index 8d3784e9..186177c7 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
@@ -1,42 +1,44 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.resources.v1_0;
-
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_FSTYPE;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_CLUSTER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_DISK_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_SERVER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DETAILS;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_INTERFACE;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_MAX_COUNT;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_NEXT_TO;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_PERIOD;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_TYPE;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_DISKS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_SERVERS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_STATISTICS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_TASKS;
-import static com.gluster.storage.management.core.constants.RESTConstants.STATISTICS_TYPE_CPU;
-import static com.gluster.storage.management.core.constants.RESTConstants.STATISTICS_TYPE_MEMORY;
-import static com.gluster.storage.management.core.constants.RESTConstants.STATISTICS_TYPE_NETWORK;
+package org.gluster.storage.management.gateway.resources.v1_0;
+
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_FSTYPE;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_MOUNTPOINT;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_CLUSTER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_DISK_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_SERVER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DETAILS;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_INTERFACE;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_MAX_COUNT;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_NEXT_TO;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_PERIOD;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_TYPE;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_DISKS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_FSTYPES;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_SERVERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_STATISTICS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_TASKS;
+import static org.gluster.storage.management.core.constants.RESTConstants.STATISTICS_TYPE_CPU;
+import static org.gluster.storage.management.core.constants.RESTConstants.STATISTICS_TYPE_MEMORY;
+import static org.gluster.storage.management.core.constants.RESTConstants.STATISTICS_TYPE_NETWORK;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -53,24 +55,25 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.constants.RESTConstants;
+import org.gluster.storage.management.core.exceptions.GlusterValidationException;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.ServerStats;
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.response.FsTypeListResponse;
+import org.gluster.storage.management.core.response.GlusterServerListResponse;
+import org.gluster.storage.management.core.response.ServerNameListResponse;
+import org.gluster.storage.management.gateway.data.ClusterInfo;
+import org.gluster.storage.management.gateway.services.ClusterService;
+import org.gluster.storage.management.gateway.services.GlusterServerService;
+import org.gluster.storage.management.gateway.tasks.InitializeDiskTask;
+import org.gluster.storage.management.gateway.utils.CpuStatsFactory;
+import org.gluster.storage.management.gateway.utils.MemoryStatsFactory;
+import org.gluster.storage.management.gateway.utils.NetworkStatsFactory;
+import org.gluster.storage.management.gateway.utils.StatsFactory;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.constants.RESTConstants;
-import com.gluster.storage.management.core.exceptions.GlusterValidationException;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.ServerStats;
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.core.response.GlusterServerListResponse;
-import com.gluster.storage.management.core.response.ServerNameListResponse;
-import com.gluster.storage.management.gateway.data.ClusterInfo;
-import com.gluster.storage.management.gateway.services.ClusterService;
-import com.gluster.storage.management.gateway.services.GlusterServerService;
-import com.gluster.storage.management.gateway.tasks.InitializeDiskTask;
-import com.gluster.storage.management.gateway.utils.CpuStatsFactory;
-import com.gluster.storage.management.gateway.utils.MemoryStatsFactory;
-import com.gluster.storage.management.gateway.utils.NetworkStatsFactory;
-import com.gluster.storage.management.gateway.utils.StatsFactory;
 import com.sun.jersey.api.core.InjectParam;
 import com.sun.jersey.spi.resource.Singleton;
 
@@ -197,12 +200,20 @@ public class GlusterServersResource extends AbstractResource {
 		return noContentResponse();
 	}
 
+	@GET
+	@Produces(MediaType.APPLICATION_XML)
+	@Path("{" + PATH_PARAM_SERVER_NAME + "}/" + RESOURCE_FSTYPES)
+	public FsTypeListResponse getFsTypes(@PathParam(PATH_PARAM_CLUSTER_NAME) String clusterName, @PathParam(PATH_PARAM_SERVER_NAME) String serverName) {
+		List<String> fsTypes = glusterServerService.getFsTypes(clusterName, serverName);
+		return new FsTypeListResponse(fsTypes);
+	}
+
 	@PUT
 	@Produces(MediaType.APPLICATION_XML)
 	@Path("{" + PATH_PARAM_SERVER_NAME + "}/" + RESOURCE_DISKS + "/{" + PATH_PARAM_DISK_NAME + "}")
 	public Response initializeDisk(@PathParam(PATH_PARAM_CLUSTER_NAME) String clusterName,
 			@PathParam(PATH_PARAM_SERVER_NAME) String serverName, @PathParam(PATH_PARAM_DISK_NAME) String diskName,
-			@FormParam(FORM_PARAM_FSTYPE) String fsType) {
+			@FormParam(FORM_PARAM_FSTYPE) String fsType, @FormParam(FORM_PARAM_MOUNTPOINT) String mountPoint) {
 
 		if (clusterName == null || clusterName.isEmpty()) {
 			return badRequestResponse("Cluster name must not be empty!");
@@ -221,7 +232,7 @@ public class GlusterServersResource extends AbstractResource {
 			// return badRequestResponse("Parameter [" + FORM_PARAM_FSTYPE + "] is missing in request!");
 		}
 
-		InitializeDiskTask initializeTask = new InitializeDiskTask(clusterService, clusterName, serverName, diskName, fsType);
+		InitializeDiskTask initializeTask = new InitializeDiskTask(clusterService, clusterName, serverName, diskName, fsType, mountPoint);
 		try {
 			initializeTask.start();
 			// Check the initialize disk status
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/KeysResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/KeysResource.java
index 186fa59f..bea9773f 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/KeysResource.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/KeysResource.java
@@ -1,26 +1,24 @@
-/**
- * KeysResource.java
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.gateway.resources.v1_0;
+ *******************************************************************************/
+package org.gluster.storage.management.gateway.resources.v1_0;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_KEYS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_KEYS;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -39,18 +37,17 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.utils.FileUtil;
+import org.gluster.storage.management.core.utils.ProcessResult;
+import org.gluster.storage.management.core.utils.ProcessUtil;
+import org.gluster.storage.management.gateway.utils.SshUtil;
 
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.utils.FileUtil;
-import com.gluster.storage.management.core.utils.ProcessResult;
-import com.gluster.storage.management.core.utils.ProcessUtil;
-import com.gluster.storage.management.gateway.utils.SshUtil;
 import com.sun.jersey.multipart.FormDataParam;
 
 @Path(RESOURCE_PATH_KEYS)
 public class KeysResource extends AbstractResource {
 	private static final Logger logger = Logger.getLogger(KeysResource.class);
-	private ProcessUtil processUtil = new ProcessUtil();
 
 	@GET
 	@Produces(MediaType.APPLICATION_OCTET_STREAM)
@@ -78,17 +75,17 @@ public class KeysResource extends AbstractResource {
 		}
 		
 		// Copy keys to temp folder
-		ProcessResult result = processUtil.executeCommand("cp", sourcePrivateKeyFile, targetPrivateKeyFile);
+		ProcessResult result = ProcessUtil.executeCommand("cp", sourcePrivateKeyFile, targetPrivateKeyFile);
 		if (!result.isSuccess()) {
 			throw new GlusterRuntimeException("Failed to copy key files! [" + result.getOutput() + "]");
 		}
-		result = processUtil.executeCommand("cp", sourcePublicKeyFile, targetPubKeyFile);
+		result = ProcessUtil.executeCommand("cp", sourcePublicKeyFile, targetPubKeyFile);
 		if (!result.isSuccess()) {
 			throw new GlusterRuntimeException("Failed to copy key files! [" + result.getOutput() + "]");
 		}
 		
 		// To compress the key files
-		result = processUtil.executeCommand("tar", "cvf", zipFile, "-C", targetDir, SshUtil.PRIVATE_KEY_FILE.getName(),
+		result = ProcessUtil.executeCommand("tar", "cvf", zipFile, "-C", targetDir, SshUtil.PRIVATE_KEY_FILE.getName(),
 				SshUtil.PUBLIC_KEY_FILE.getName());
 		if (!result.isSuccess()) {
 			throw new GlusterRuntimeException("Failed to compress key files! [" + result.getOutput() + "]");
@@ -96,7 +93,7 @@ public class KeysResource extends AbstractResource {
 
 		// To remove the copied key files
 		try {
-			processUtil.executeCommand("rm", "-f", targetPrivateKeyFile, targetPubKeyFile); // Ignore the errors if any
+			ProcessUtil.executeCommand("rm", "-f", targetPrivateKeyFile, targetPubKeyFile); // Ignore the errors if any
 		} catch (Exception e) {
 			logger.warn(e.toString());
 		}
@@ -125,7 +122,7 @@ public class KeysResource extends AbstractResource {
 			}
 		}
 		// Extract SSH private and public key files.
-		ProcessResult output = processUtil.executeCommand("tar", "xvf", uploadedFile.getAbsolutePath(), "-C",
+		ProcessResult output = ProcessUtil.executeCommand("tar", "xvf", uploadedFile.getAbsolutePath(), "-C",
 				SshUtil.SSH_AUTHORIZED_KEYS_DIR_LOCAL);
 		uploadedFile.delete();
 		if (!output.isSuccess()) {
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/TasksResource.java
index 16faf7de..e147a7a4 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/TasksResource.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/TasksResource.java
@@ -1,30 +1,28 @@
-/**
- * TaskResource.java
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.gateway.resources.v1_0;
+ *******************************************************************************/
+package org.gluster.storage.management.gateway.resources.v1_0;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_OPERATION;
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_CLUSTER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_TASK_ID;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_TASKS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_OPERATION;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_CLUSTER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_TASK_ID;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_TASKS;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -42,15 +40,15 @@ import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
+import org.gluster.storage.management.core.constants.RESTConstants;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.exceptions.GlusterValidationException;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.response.TaskInfoListResponse;
+import org.gluster.storage.management.gateway.tasks.Task;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.constants.RESTConstants;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.exceptions.GlusterValidationException;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.response.TaskInfoListResponse;
-import com.gluster.storage.management.gateway.tasks.Task;
 import com.sun.jersey.spi.resource.Singleton;
 
 @Path(RESOURCE_PATH_CLUSTERS + "/{" + PATH_PARAM_CLUSTER_NAME + "}/" + RESOURCE_TASKS)
@@ -194,7 +192,8 @@ public class TasksResource extends AbstractResource {
 		
 		if(taskOperation == null || taskOperation.isEmpty()) {
 			int taskStatus = task.getTaskInfo().getStatus().getCode();
-			if (taskStatus == Status.STATUS_CODE_SUCCESS || taskStatus == Status.STATUS_CODE_FAILURE) {
+			if (taskStatus == Status.STATUS_CODE_SUCCESS || taskStatus == Status.STATUS_CODE_FAILURE
+					|| taskStatus == Status.STATUS_CODE_ERROR) {
 				taskOperation = RESTConstants.TASK_DELETE;
 			} else {
 				taskOperation = RESTConstants.TASK_STOP;
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/UsersResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/UsersResource.java
index 6914e505..feb1bf50 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/UsersResource.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/UsersResource.java
@@ -1,27 +1,27 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.resources.v1_0;
+package org.gluster.storage.management.gateway.resources.v1_0;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_NEW_PASSWORD;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_OLD_PASSWORD;
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_USER;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_USERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_NEW_PASSWORD;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_OLD_PASSWORD;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_USER;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_USERS;
 
 import javax.ws.rs.FormParam;
 import javax.ws.rs.GET;
@@ -33,6 +33,9 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.exceptions.GlusterValidationException;
+import org.gluster.storage.management.core.model.Status;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.dao.SaltSource;
 import org.springframework.security.authentication.encoding.PasswordEncoder;
@@ -43,9 +46,6 @@ import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.provisioning.JdbcUserDetailsManager;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.exceptions.GlusterValidationException;
-import com.gluster.storage.management.core.model.Status;
 import com.sun.jersey.spi.resource.Singleton;
 
 @Singleton
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
index 14e7be8c..62e1beb1 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
@@ -1,63 +1,61 @@
-/**
- * VolumesResource.java
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.gateway.resources.v1_0;
+ *******************************************************************************/
+package org.gluster.storage.management.gateway.resources.v1_0;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_ACCESS_PROTOCOLS;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_AUTO_COMMIT;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_BRICKS;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CIFS_ENABLE;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CIFS_USERS;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_FIX_LAYOUT;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_FORCED_DATA_MIGRATE;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_MIGRATE_DATA;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_OPERATION;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_REPLICA_COUNT;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SOURCE;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_STRIPE_COUNT;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_TARGET;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_TRANSPORT_TYPE;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_OPTIONS;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_TYPE;
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_FORCE;
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_CLUSTER_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_VOLUME_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_BRICKS;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_BRICK_NAME;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DELETE_OPTION;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DOWNLOAD;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_FROM_TIMESTAMP;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_LINE_COUNT;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_LOG_SEVERITY;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_MAX_COUNT;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_NEXT_TO;
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_TO_TIMESTAMP;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_BRICKS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_DEFAULT_OPTIONS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_DOWNLOAD;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_LOGS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_OPTIONS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_TASKS;
-import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_VOLUMES;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_ACCESS_PROTOCOLS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_AUTO_COMMIT;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_BRICKS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CIFS_ENABLE;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_CIFS_USERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_FIX_LAYOUT;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_FORCE;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_FORCED_DATA_MIGRATE;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_MIGRATE_DATA;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_OPERATION;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_REPLICA_COUNT;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SOURCE;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_STRIPE_COUNT;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_TARGET;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_TRANSPORT_TYPE;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_OPTIONS;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_VOLUME_TYPE;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_CLUSTER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_VOLUME_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_BRICKS;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_BRICK_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DELETE_OPTION;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_DOWNLOAD;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_FROM_TIMESTAMP;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_LINE_COUNT;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_LOG_SEVERITY;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_MAX_COUNT;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_NEXT_TO;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_TO_TIMESTAMP;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_BRICKS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_DEFAULT_OPTIONS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_DOWNLOAD;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_LOGS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_OPTIONS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_TASKS;
+import static org.gluster.storage.management.core.constants.RESTConstants.RESOURCE_VOLUMES;
 
 import java.io.File;
 import java.util.Arrays;
@@ -76,20 +74,20 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.constants.RESTConstants;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.exceptions.GlusterValidationException;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.VolumeLogMessage;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+import org.gluster.storage.management.core.response.LogMessageListResponse;
+import org.gluster.storage.management.core.response.VolumeListResponse;
+import org.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
+import org.gluster.storage.management.core.utils.FileUtil;
+import org.gluster.storage.management.gateway.services.ClusterService;
+import org.gluster.storage.management.gateway.services.VolumeService;
 
-import com.gluster.storage.management.core.constants.RESTConstants;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.exceptions.GlusterValidationException;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
-import com.gluster.storage.management.core.model.VolumeLogMessage;
-import com.gluster.storage.management.core.response.LogMessageListResponse;
-import com.gluster.storage.management.core.response.VolumeListResponse;
-import com.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
-import com.gluster.storage.management.core.utils.FileUtil;
-import com.gluster.storage.management.gateway.services.ClusterService;
-import com.gluster.storage.management.gateway.services.VolumeService;
 import com.sun.jersey.api.core.InjectParam;
 import com.sun.jersey.spi.resource.Singleton;
 
diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/security/GlusterUserDetailsService.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/security/GlusterUserDetailsService.java
new file mode 100644
index 00000000..1179a7b3
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/security/GlusterUserDetailsService.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
+ *
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.gateway.security;
+
+import org.springframework.security.core.userdetails.UserDetailsService;
+
+/**
+ *
+ */
+public interface GlusterUserDetailsService extends UserDetailsService {
+	void changePassword(String username, String password);
+}
+
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/security/UserAuthDao.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/security/UserAuthDao.java
index cb2ecb24..22695a75 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/security/UserAuthDao.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/security/UserAuthDao.java
@@ -1,32 +1,30 @@
-/**
- * UserAuthDao.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Gateway 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.gateway.security;
+ *******************************************************************************/
+package org.gluster.storage.management.gateway.security;
 
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.security.core.userdetails.jdbc.JdbcDaoImpl;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 
 /**
  * 
@@ -36,7 +34,7 @@ public class UserAuthDao extends JdbcDaoImpl implements GlusterUserDetailsServic
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see com.gluster.storage.management.gateway.security.GlusterUserDetailsService#changePassword(java.lang.String,
+	 * @see org.gluster.storage.management.gateway.security.GlusterUserDetailsService#changePassword(java.lang.String,
 	 * java.lang.String)
 	 */
 	@Override
diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/AbstractGlusterInterface.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/AbstractGlusterInterface.java
new file mode 100644
index 00000000..aebab1e3
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/AbstractGlusterInterface.java
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
+ *
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.gateway.services;
+
+import org.gluster.storage.management.gateway.utils.ServerUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * Abstract Gluster Interface - provides functionality common across all versions of GlusterFS e.g. version check.
+ */
+public abstract class AbstractGlusterInterface implements GlusterInterface {
+	
+	@Autowired
+	protected ServerUtil serverUtil;
+
+	@Override
+	public String getVersion(String serverName) {
+		return serverUtil.executeOnServer(serverName, "gluster --version").split("\n")[0].replaceAll("glusterfs ", "")
+				.replaceAll(" built.*", "");
+	}
+}
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/ClusterService.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/ClusterService.java
index 4bc68c5e..c29d2572 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/ClusterService.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/ClusterService.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.services;
+package org.gluster.storage.management.gateway.services;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,19 +24,19 @@ import java.util.List;
 import javax.persistence.EntityTransaction;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.exceptions.ConnectionException;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.utils.LRUCache;
+import org.gluster.storage.management.gateway.data.ClusterInfo;
+import org.gluster.storage.management.gateway.data.PersistenceDao;
+import org.gluster.storage.management.gateway.data.ServerInfo;
+import org.gluster.storage.management.gateway.utils.ServerUtil;
+import org.gluster.storage.management.gateway.utils.SshUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.exceptions.ConnectionException;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.utils.LRUCache;
-import com.gluster.storage.management.gateway.data.ClusterInfo;
-import com.gluster.storage.management.gateway.data.PersistenceDao;
-import com.gluster.storage.management.gateway.data.ServerInfo;
-import com.gluster.storage.management.gateway.utils.ServerUtil;
-import com.gluster.storage.management.gateway.utils.SshUtil;
 
 /**
  * Service class for functionality related to clusters
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/DiscoveredServerService.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/DiscoveredServerService.java
index 6fad758c..256f9ba0 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/DiscoveredServerService.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/DiscoveredServerService.java
@@ -1,35 +1,35 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.services;
+package org.gluster.storage.management.gateway.services;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.utils.ProcessUtil;
+import org.gluster.storage.management.gateway.utils.ServerUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.utils.ProcessUtil;
-import com.gluster.storage.management.gateway.utils.ServerUtil;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/Gluster323InterfaceService.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/Gluster323InterfaceService.java
index 9b093baf..2cf2652a 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/Gluster323InterfaceService.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/Gluster323InterfaceService.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.services;
+package org.gluster.storage.management.gateway.services;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,22 +24,22 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Brick.BRICK_STATUS;
+import org.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+import org.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
+import org.gluster.storage.management.core.utils.StringUtil;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.Brick.BRICK_STATUS;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
-import com.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
-import com.gluster.storage.management.core.utils.StringUtil;
 
 /**
  * Gluster Interface for GlusterFS version 3.2.3
@@ -66,7 +66,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	private static final Logger logger = Logger.getLogger(Gluster323InterfaceService.class);
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#addServer(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#addServer(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void addServer(String existingServer, String newServer) {
@@ -76,7 +76,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#startVolume(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#startVolume(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void startVolume(String volumeName, String knownServer, Boolean force) {
@@ -84,7 +84,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#stopVolume(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#stopVolume(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void stopVolume(String volumeName, String knownServer, Boolean force) {
@@ -93,7 +93,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#resetOptions(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#resetOptions(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void resetOptions(String volumeName, String knownServer) {
@@ -101,7 +101,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#createVolume(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#createVolume(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void createVolume(String knownServer, String volumeName, String volumeTypeStr, String transportTypeStr,
@@ -148,7 +148,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#createOptions(java.lang.String, java.util.Map, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#createOptions(java.lang.String, java.util.Map, java.lang.String)
 	 */
 	@Override
 	public void createOptions(String volumeName, Map<String, String> options, String knownServer) {
@@ -173,7 +173,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#setOption(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#setOption(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void setOption(String volumeName, String key, String value, String knownServer) {
@@ -182,7 +182,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#deleteVolume(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#deleteVolume(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void deleteVolume(String volumeName, String knownServer) {
@@ -323,7 +323,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getVolume(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getVolume(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public Volume getVolume(String volumeName, String knownServer) {
@@ -331,7 +331,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getAllVolumes(java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getAllVolumes(java.lang.String)
 	 */
 	@Override
 	public List<Volume> getAllVolumes(String knownServer) {
@@ -403,7 +403,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#addBricks(java.lang.String, java.util.List, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#addBricks(java.lang.String, java.util.List, java.lang.String)
 	 */
 	@Override
 	public void addBricks(String volumeName, List<String> bricks, String knownServer) {
@@ -416,7 +416,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getLogLocation(java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getLogLocation(java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public String getLogLocation(String volumeName, String brickName, String knownServer) {
@@ -431,10 +431,10 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getLogFileNameForBrickDir(java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getLogFileNameForBrickDir(java.lang.String)
 	 */
 	@Override
-	public String getLogFileNameForBrickDir(String brickDir) {
+	public String getLogFileNameForBrickDir(String serverName, String brickDir) {
 		String logFileName = brickDir;
 		if (logFileName.length() > 0 && logFileName.charAt(0) == '/') {
 			logFileName = logFileName.replaceFirst("/", "");
@@ -444,7 +444,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#removeBricks(java.lang.String, java.util.List, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#removeBricks(java.lang.String, java.util.List, java.lang.String)
 	 */
 	@Override
 	public void removeBricks(String volumeName, List<String> bricks, String knownServer) {
@@ -456,7 +456,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#removeServer(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#removeServer(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void removeServer(String existingServer, String serverName) {
@@ -464,7 +464,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#checkRebalanceStatus(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#checkRebalanceStatus(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public TaskStatus checkRebalanceStatus(String serverName, String volumeName) {
@@ -483,7 +483,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#stopRebalance(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#stopRebalance(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void stopRebalance(String serverName, String volumeName) {
@@ -516,7 +516,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#executeBrickMigration(java.lang.String,
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#executeBrickMigration(java.lang.String,
 	 * java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
@@ -526,7 +526,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.services.GlusterInterface#pauseBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.services.GlusterInterface#pauseBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void pauseBrickMigration(String serverName, String volumeName, String fromBrick, String toBrick) {
@@ -535,7 +535,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.services.GlusterInterface#stopBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.services.GlusterInterface#stopBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void stopBrickMigration(String serverName, String volumeName, String fromBrick, String toBrick) {
@@ -544,7 +544,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.services.GlusterInterface#commitBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.services.GlusterInterface#commitBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void commitBrickMigration(String serverName, String volumeName, String fromBrick, String toBrick) {
@@ -553,7 +553,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.services.GlusterInterface#checkBrickMigrationStatus(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.services.GlusterInterface#checkBrickMigrationStatus(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public TaskStatus checkBrickMigrationStatus(String serverName, String volumeName, String fromBrick, String toBrick) {
@@ -579,7 +579,7 @@ public class Gluster323InterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getVolumeOptionsInfo(java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getVolumeOptionsInfo(java.lang.String)
 	 */
 	@Override
 	public VolumeOptionInfoListResponse getVolumeOptionsInfo(String serverName) {
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterInterface.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterInterface.java
index c282bb45..56881c5c 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterInterface.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterInterface.java
@@ -1,13 +1,32 @@
-package com.gluster.storage.management.gateway.services;
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
+ *
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.gateway.services;
 
 import java.util.List;
 import java.util.Map;
 
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
-import com.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.Volume.TRANSPORT_TYPE;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+import org.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
+
 
 /**
  * Interface for interacting with GlusterFS. Every version of GlusterFS supported by the Gluster Management Gateway will
@@ -224,11 +243,13 @@ public interface GlusterInterface {
 	/**
 	 * Returns the log file name for given brick directory.
 	 * 
+	 * @param serverName
+	 *            Server to which the brick belongs
 	 * @param brickDir
 	 *            Brick directory for which log file name is to be returned.
 	 * @return The log file name (without path) for the given brick directory.
 	 */
-	public abstract String getLogFileNameForBrickDir(String brickDir);
+	public abstract String getLogFileNameForBrickDir(String serverName, String brickDir);
 
 	/**
 	 * Checks the status of "Rebalance" operation on given Volume by executing appropriate Gluster command on the
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterInterfaceService.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterInterfaceService.java
index 4baca5d9..5cc87eee 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterInterfaceService.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterInterfaceService.java
@@ -1,34 +1,32 @@
-/**
- * GlusterInterfaceService.java
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.gateway.services;
+ *******************************************************************************/
+package org.gluster.storage.management.gateway.services;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
 
 @Component
 public class GlusterInterfaceService extends AbstractGlusterInterface {
@@ -61,7 +59,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#addServer(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#addServer(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void addServer(String existingServer, String newServer) {
@@ -69,7 +67,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#startVolume(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#startVolume(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void startVolume(String volumeName, String knownServer, Boolean force) {
@@ -77,7 +75,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#stopVolume(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#stopVolume(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void stopVolume(String volumeName, String knownServer, Boolean force) {
@@ -89,7 +87,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#resetOptions(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#resetOptions(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void resetOptions(String volumeName, String knownServer) {
@@ -97,7 +95,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#createVolume(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#createVolume(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.Integer, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void createVolume(String knownServer, String volumeName, String volumeTypeStr, String transportTypeStr,
@@ -107,7 +105,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#createOptions(java.lang.String, java.util.Map, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#createOptions(java.lang.String, java.util.Map, java.lang.String)
 	 */
 	@Override
 	public void createOptions(String volumeName, Map<String, String> options, String knownServer) {
@@ -115,7 +113,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#setOption(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#setOption(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void setOption(String volumeName, String key, String value, String knownServer) {
@@ -123,7 +121,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#deleteVolume(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#deleteVolume(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void deleteVolume(String volumeName, String knownServer) {
@@ -131,7 +129,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getVolume(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getVolume(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public Volume getVolume(String volumeName, String knownServer) {
@@ -139,7 +137,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getAllVolumes(java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getAllVolumes(java.lang.String)
 	 */
 	@Override
 	public List<Volume> getAllVolumes(String knownServer) {
@@ -147,7 +145,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#addBricks(java.lang.String, java.util.List, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#addBricks(java.lang.String, java.util.List, java.lang.String)
 	 */
 	@Override
 	public void addBricks(String volumeName, List<String> bricks, String knownServer) {
@@ -155,7 +153,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getLogLocation(java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getLogLocation(java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public String getLogLocation(String volumeName, String brickName, String knownServer) {
@@ -163,15 +161,15 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getLogFileNameForBrickDir(java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getLogFileNameForBrickDir(java.lang.String)
 	 */
 	@Override
-	public String getLogFileNameForBrickDir(String brickDir) {
-		return getGlusterInterface(brickDir.split(":")[0]).getLogFileNameForBrickDir(brickDir);
+	public String getLogFileNameForBrickDir(String serverName, String brickDir) {
+		return getGlusterInterface(serverName).getLogFileNameForBrickDir(serverName, brickDir);
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#removeBricks(java.lang.String, java.util.List, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#removeBricks(java.lang.String, java.util.List, java.lang.String)
 	 */
 	@Override
 	public void removeBricks(String volumeName, List<String> bricks, String knownServer) {
@@ -179,7 +177,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#removeServer(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#removeServer(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void removeServer(String existingServer, String serverName) {
@@ -187,7 +185,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#checkRebalanceStatus(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#checkRebalanceStatus(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public TaskStatus checkRebalanceStatus(String serverName, String volumeName) {
@@ -195,7 +193,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#stopRebalance(java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#stopRebalance(java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void stopRebalance(String serverName, String volumeName) {
@@ -203,7 +201,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#executeBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#executeBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void startBrickMigration(String onlineServerName, String volumeName, String fromBrick, String toBrick) {
@@ -212,7 +210,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.services.GlusterInterface#pauseBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.services.GlusterInterface#pauseBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void pauseBrickMigration(String serverName, String volumeName, String fromBrick, String toBrick) {
@@ -221,7 +219,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.services.GlusterInterface#stopBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.services.GlusterInterface#stopBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void stopBrickMigration(String serverName, String volumeName, String fromBrick, String toBrick) {
@@ -230,7 +228,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.services.GlusterInterface#commitBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.services.GlusterInterface#commitBrickMigration(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public void commitBrickMigration(String serverName, String volumeName, String fromBrick, String toBrick) {
@@ -239,7 +237,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	
 	/*
 	 * (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.services.GlusterInterface#checkBrickMigrationStatus(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.services.GlusterInterface#checkBrickMigrationStatus(java.lang.String, java.lang.String, java.lang.String, java.lang.String)
 	 */
 	@Override
 	public TaskStatus checkBrickMigrationStatus(String serverName, String volumeName, String fromBrick, String toBrick) {
@@ -247,7 +245,7 @@ public class GlusterInterfaceService extends AbstractGlusterInterface {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getVolumeOptionsInfo(java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getVolumeOptionsInfo(java.lang.String)
 	 */
 	@Override
 	public VolumeOptionInfoListResponse getVolumeOptionsInfo(String serverName) {
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterServerService.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterServerService.java
index da1a8487..356dcd1a 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterServerService.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/GlusterServerService.java
@@ -1,47 +1,47 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.services;
+package org.gluster.storage.management.gateway.services;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
+import static org.gluster.storage.management.core.constants.RESTConstants.FORM_PARAM_SERVER_NAME;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.exceptions.ConnectionException;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.exceptions.GlusterValidationException;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
+import org.gluster.storage.management.core.utils.ProcessUtil;
+import org.gluster.storage.management.core.utils.StringUtil;
+import org.gluster.storage.management.gateway.data.ClusterInfo;
+import org.gluster.storage.management.gateway.data.ServerInfo;
+import org.gluster.storage.management.gateway.utils.ServerUtil;
+import org.gluster.storage.management.gateway.utils.SshUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.exceptions.ConnectionException;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.exceptions.GlusterValidationException;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
-import com.gluster.storage.management.core.utils.ProcessUtil;
-import com.gluster.storage.management.core.utils.StringUtil;
-import com.gluster.storage.management.gateway.data.ClusterInfo;
-import com.gluster.storage.management.gateway.data.ServerInfo;
-import com.gluster.storage.management.gateway.utils.ServerUtil;
-import com.gluster.storage.management.gateway.utils.SshUtil;
 
 /**
  *
@@ -133,7 +133,7 @@ public class GlusterServerService {
 	}
 	
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getGlusterServer(com.gluster.storage.management.core.model.GlusterServer, java.lang.String)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getGlusterServer(org.gluster.storage.management.core.model.GlusterServer, java.lang.String)
 	 */
 	public GlusterServer getGlusterServer(String onlineServer, String serverName) {
 		List<GlusterServer> servers = getGlusterServers(onlineServer);
@@ -142,6 +142,20 @@ public class GlusterServerService {
 				return server;
 			}
 		}
+
+		// Server not found. It's possible that the server name returned by glusterfs is actually IP address
+		// Hence fetch details of all servers and then compare the host names again.
+		String errMsg = fetchDetailsOfServers(Collections.synchronizedList(servers));
+		if (!errMsg.isEmpty()) {
+			throw new GlusterRuntimeException("Couldn't fetch details for server(s): " + errMsg);
+		}
+		for (GlusterServer server : servers) {
+			if (server.getName().equalsIgnoreCase(serverName)) {
+				return server;
+			}
+		}
+
+		// still not found!
 		return null;
 	}
 	
@@ -150,13 +164,14 @@ public class GlusterServerService {
 	}
 
 	/* (non-Javadoc)
-	 * @see com.gluster.storage.management.gateway.utils.GlusterInterface#getGlusterServers(com.gluster.storage.management.core.model.GlusterServer)
+	 * @see org.gluster.storage.management.gateway.utils.GlusterInterface#getGlusterServers(org.gluster.storage.management.core.model.GlusterServer)
 	 */
 	public List<GlusterServer> getGlusterServers(String knownServerName) {
 		String output = getPeerStatus(knownServerName);
 
 		GlusterServer knownServer = new GlusterServer(knownServerName);
 		knownServer.setUuid(getUuid(knownServerName));
+		knownServer.setStatus(SERVER_STATUS.ONLINE);
 		
 		List<GlusterServer> glusterServers = new ArrayList<GlusterServer>();
 		glusterServers.add(knownServer);
@@ -504,4 +519,12 @@ public class GlusterServerService {
 			}
 		}
 	}
+
+	public List<String> getFsTypes(String clusterName, String serverName) {
+		if (isValidServer(clusterName, serverName)) {
+			return serverUtil.getFsTypes(serverName);
+		} else {
+			throw new GlusterRuntimeException(serverName + " does not belong to the cluster [" + clusterName + "]");
+		}
+	}
 }
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/VolumeService.java
index 1a86b9cd..1dc92cd4 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/VolumeService.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/services/VolumeService.java
@@ -1,26 +1,26 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.services;
+package org.gluster.storage.management.gateway.services;
 
-import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_BRICKS;
-import static com.gluster.storage.management.core.constants.RESTConstants.TASK_START;
-import static com.gluster.storage.management.core.constants.RESTConstants.TASK_STOP;
+import static org.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_BRICKS;
+import static org.gluster.storage.management.core.constants.RESTConstants.TASK_START;
+import static org.gluster.storage.management.core.constants.RESTConstants.TASK_STOP;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -33,33 +33,33 @@ import java.util.Date;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.exceptions.ConnectionException;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.exceptions.GlusterValidationException;
+import org.gluster.storage.management.core.model.Brick;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.Volume;
+import org.gluster.storage.management.core.model.VolumeLogMessage;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.model.Volume.NAS_PROTOCOL;
+import org.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
+import org.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
+import org.gluster.storage.management.core.response.LogMessageListResponse;
+import org.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
+import org.gluster.storage.management.core.utils.DateUtil;
+import org.gluster.storage.management.core.utils.FileUtil;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
+import org.gluster.storage.management.core.utils.ProcessResult;
+import org.gluster.storage.management.core.utils.ProcessUtil;
+import org.gluster.storage.management.gateway.data.ClusterInfo;
+import org.gluster.storage.management.gateway.resources.v1_0.TasksResource;
+import org.gluster.storage.management.gateway.tasks.MigrateBrickTask;
+import org.gluster.storage.management.gateway.tasks.RebalanceVolumeTask;
+import org.gluster.storage.management.gateway.utils.ServerUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.exceptions.ConnectionException;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.exceptions.GlusterValidationException;
-import com.gluster.storage.management.core.model.Brick;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.model.Volume;
-import com.gluster.storage.management.core.model.Volume.NAS_PROTOCOL;
-import com.gluster.storage.management.core.model.Volume.VOLUME_STATUS;
-import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
-import com.gluster.storage.management.core.model.VolumeLogMessage;
-import com.gluster.storage.management.core.response.LogMessageListResponse;
-import com.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
-import com.gluster.storage.management.core.utils.DateUtil;
-import com.gluster.storage.management.core.utils.FileUtil;
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
-import com.gluster.storage.management.core.utils.ProcessResult;
-import com.gluster.storage.management.core.utils.ProcessUtil;
-import com.gluster.storage.management.gateway.data.ClusterInfo;
-import com.gluster.storage.management.gateway.resources.v1_0.TasksResource;
-import com.gluster.storage.management.gateway.tasks.MigrateBrickTask;
-import com.gluster.storage.management.gateway.tasks.RebalanceVolumeTask;
-import com.gluster.storage.management.gateway.utils.ServerUtil;
 
 /**
  *
@@ -465,7 +465,7 @@ public class VolumeService {
 		for (Brick brick : volume.getBricks()) {
 			String logDir = glusterUtil.getLogLocation(volume.getName(), brick.getQualifiedName(),
 					brick.getServerName());
-			String logFileName = glusterUtil.getLogFileNameForBrickDir(brick.getBrickDirectory());
+			String logFileName = glusterUtil.getLogFileNameForBrickDir(brick.getServerName(), brick.getBrickDirectory());
 			String logFilePath = logDir + CoreConstants.FILE_SEPARATOR + logFileName;
 
 			serverUtil.getFileFromServer(brick.getServerName(), logFilePath, tempDirPath);
@@ -587,7 +587,7 @@ public class VolumeService {
 	private List<VolumeLogMessage> getBrickLogs(Volume volume, Brick brick, Integer lineCount)
 			throws GlusterRuntimeException {
 		String logDir = glusterUtil.getLogLocation(volume.getName(), brick.getQualifiedName(), brick.getServerName());
-		String logFileName = glusterUtil.getLogFileNameForBrickDir(brick.getBrickDirectory());
+		String logFileName = glusterUtil.getLogFileNameForBrickDir(brick.getServerName(), brick.getBrickDirectory());
 		String logFilePath = logDir + CoreConstants.FILE_SEPARATOR + logFileName;
 
 		// Usage: get_volume_disk_log.py <volumeName> <diskName> <lineCount>
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitServerTask.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/InitServerTask.java
index db95e8b6..99e8c63d 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitServerTask.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/InitServerTask.java
@@ -1,24 +1,22 @@
-/**
- * GlusterServerInitializer.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Gateway 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.gateway.tasks;
+ *******************************************************************************/
+package org.gluster.storage.management.gateway.tasks;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -32,6 +30,10 @@ import java.util.List;
 import javax.servlet.ServletContext;
 
 import org.apache.derby.tools.ij;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.gateway.data.ClusterInfo;
+import org.gluster.storage.management.gateway.data.PersistenceDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.RowCallbackHandler;
 import org.springframework.jdbc.core.support.JdbcDaoSupport;
@@ -40,10 +42,6 @@ import org.springframework.security.authentication.encoding.PasswordEncoder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.gateway.data.ClusterInfo;
-import com.gluster.storage.management.gateway.data.PersistenceDao;
 
 /**
  * Initializes the Gluster Management Server.
@@ -59,7 +57,7 @@ public class InitServerTask extends JdbcDaoSupport {
 	private UserDetailsService userDetailsService;
 
 	@Autowired
-	private String appVersion;
+	private String dataVersion;
 
 	@Autowired
 	private PersistenceDao<ClusterInfo> clusterDao;
@@ -106,7 +104,7 @@ public class InitServerTask extends JdbcDaoSupport {
 
 	private void initDatabase() {
 		logger.info("Initializing server data...");
-		executeScriptsFrom(getDirFromRelativePath(SCRIPT_DIR + appVersion));
+		executeScriptsFrom(getDirFromRelativePath(SCRIPT_DIR + dataVersion));
 
 		securePasswords(); // encrypt the passwords
 	}
@@ -138,14 +136,13 @@ public class InitServerTask extends JdbcDaoSupport {
 	 */
 	public synchronized void initServer() {
 		try {
-			String dbVersion = getDBVersion();
-			if (!appVersion.equals(dbVersion)) {
-				logger.info("App version [" + appVersion + "] differs from data version [" + dbVersion
-						+ "]. Trying to upgrade data...");
-				upgradeData(dbVersion, appVersion);
+			String currentDataVersion = getDataVersion();
+			if (!dataVersion.equals(currentDataVersion)) {
+				logger.info("Upgrading data from [" + currentDataVersion + "] to [" + dataVersion + "]...");
+				upgradeData(currentDataVersion, dataVersion);
 			}
 		} catch (Exception ex) {
-			logger.info("No cluster created yet. DB version query failed with error [" + ex.getMessage() + "]", ex);
+			logger.info("Data version query failed with error [" + ex.getMessage() + "]", ex);
 			// Database not created yet. Create it!
 			initDatabase();
 		}
@@ -155,7 +152,7 @@ public class InitServerTask extends JdbcDaoSupport {
 		executeScriptsFrom(getDirFromRelativePath(SCRIPT_DIR + fromVersion + "-" + toVersion));
 	}
 
-	private String getDBVersion() {
+	private String getDataVersion() {
 		return (String) clusterDao.getSingleResultFromSQL("select version from version");
 	}
 }
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitializeDiskTask.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/InitializeDiskTask.java
index 4c437737..3043057a 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/InitializeDiskTask.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/InitializeDiskTask.java
@@ -1,38 +1,36 @@
-/**
- * InitializeDiskTask.java
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.gateway.tasks;
-
+ *******************************************************************************/
+package org.gluster.storage.management.gateway.tasks;
+
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.exceptions.ConnectionException;
+import org.gluster.storage.management.core.model.InitDiskStatusResponse;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.model.InitDiskStatusResponse.FORMAT_STATUS;
+import org.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
+import org.gluster.storage.management.gateway.services.ClusterService;
+import org.gluster.storage.management.gateway.utils.ServerUtil;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.context.ContextLoader;
 
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.exceptions.ConnectionException;
-import com.gluster.storage.management.core.model.InitDiskStatusResponse;
-import com.gluster.storage.management.core.model.InitDiskStatusResponse.FORMAT_STATUS;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.gateway.services.ClusterService;
-import com.gluster.storage.management.gateway.utils.ServerUtil;
 import com.sun.jersey.core.util.Base64;
 
 public class InitializeDiskTask extends Task {
@@ -43,10 +41,11 @@ public class InitializeDiskTask extends Task {
 	private String serverName;
 	private String diskName;
 	private String fsType;
+	private String mountPoint;
 	private ServerUtil serverUtil;
 
 	public InitializeDiskTask(ClusterService clusterService, String clusterName, String serverName, String diskName,
-			String fsType) {
+			String fsType, String mountPoint) {
 		// Reference contains "Server:disk"
 		super(clusterService, clusterName, TASK_TYPE.DISK_FORMAT, serverName + ":" + diskName, "Initialize disk "
 				+ serverName + ":" + diskName, false, false, false);
@@ -54,6 +53,7 @@ public class InitializeDiskTask extends Task {
 		setServerName(serverName);
 		setDiskName(diskName);
 		setFsType(fsType);
+		setMountpoint(mountPoint);
 		taskInfo.setName(getId());
 		init();
 	}
@@ -117,10 +117,8 @@ public class InitializeDiskTask extends Task {
 	}
 
 	private void startInitializeDisk(String serverName) {
-		String fsTypeCommand = (getFsType().equals(GlusterConstants.FSTYPE_DEFAULT)) ? "" : " -t " + getFsType();
-		
-		String output = serverUtil.executeScriptOnServer(serverName, INITIALIZE_DISK_SCRIPT + fsTypeCommand + " "
-				+ getDiskName());
+		String output = serverUtil.executeScriptOnServer(serverName, INITIALIZE_DISK_SCRIPT + " " + getFsType() + " \""
+				+ getMountpoint() + "\" " + getDiskName() );
 		TaskStatus taskStatus = new TaskStatus(new Status(Status.STATUS_CODE_RUNNING, output));
 		taskStatus.setPercentageSupported((getFsType().equals(GlusterConstants.FSTYPE_XFS)) ? false : true);
 		getTaskInfo().setStatus(taskStatus);
@@ -187,4 +185,12 @@ public class InitializeDiskTask extends Task {
 	public String getFsType() {
 		return fsType;
 	}
+	
+	public void setMountpoint(String deviceMountPoint) {
+		this.mountPoint = deviceMountPoint;
+	}
+	
+	public String getMountpoint() {
+		return mountPoint;
+	}
 }
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/MigrateBrickTask.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/MigrateBrickTask.java
index e5cb17f1..8f0f4ef1 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/MigrateBrickTask.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/MigrateBrickTask.java
@@ -1,36 +1,34 @@
-/**
- * MigrateDiskTask.java
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.gateway.tasks;
-
+ *******************************************************************************/
+package org.gluster.storage.management.gateway.tasks;
+
+import org.gluster.storage.management.core.exceptions.ConnectionException;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
+import org.gluster.storage.management.gateway.services.ClusterService;
+import org.gluster.storage.management.gateway.services.GlusterInterfaceService;
+import org.gluster.storage.management.gateway.utils.ServerUtil;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.context.ContextLoader;
 
-import com.gluster.storage.management.core.exceptions.ConnectionException;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.gateway.services.ClusterService;
-import com.gluster.storage.management.gateway.services.GlusterInterfaceService;
-import com.gluster.storage.management.gateway.utils.ServerUtil;
 import com.sun.jersey.core.util.Base64;
 
 public class MigrateBrickTask extends Task {
@@ -98,7 +96,7 @@ public class MigrateBrickTask extends Task {
 				// online server might have gone Offline. try with a new one.
 				startMigration(getNewOnlineServer().getName());
 			} else {
-				throw new GlusterRuntimeException(e.getMessage());
+				throw new GlusterRuntimeException("Error while starting migration!", e);
 			}
 		}
 	}
@@ -195,9 +193,11 @@ public class MigrateBrickTask extends Task {
 			if (e instanceof ConnectionException || serverUtil.isServerOnline(getOnlineServer()) == false) {
 				// online server might have gone offline. try with a new one.
 				return checkMigrationStatus(getNewOnlineServer().getName());
-			} 
+			} else {
+				getTaskInfo().setStatus(new TaskStatus(new Status(Status.STATUS_CODE_ERROR, e.getMessage())));
+				return taskInfo.getStatus();
+			}
 		}
-		return null;
 	}
 	
 	private TaskStatus checkMigrationStatus(String serverName) {
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/RebalanceVolumeTask.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/RebalanceVolumeTask.java
index 410260ca..3f68206b 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/RebalanceVolumeTask.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/RebalanceVolumeTask.java
@@ -1,36 +1,34 @@
-/**
- * RebalanceVolumeTask.java
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.gateway.tasks;
+ *******************************************************************************/
+package org.gluster.storage.management.gateway.tasks;
 
+import org.gluster.storage.management.core.exceptions.ConnectionException;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
+import org.gluster.storage.management.gateway.services.ClusterService;
+import org.gluster.storage.management.gateway.services.GlusterInterfaceService;
+import org.gluster.storage.management.gateway.utils.ServerUtil;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.context.ContextLoader;
 
-import com.gluster.storage.management.core.exceptions.ConnectionException;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.gateway.services.ClusterService;
-import com.gluster.storage.management.gateway.services.GlusterInterfaceService;
-import com.gluster.storage.management.gateway.utils.ServerUtil;
 import com.sun.jersey.core.util.Base64;
 
 public class RebalanceVolumeTask extends Task {
@@ -121,9 +119,11 @@ public class RebalanceVolumeTask extends Task {
 				// online server might have gone offline. update the failure status
 				getTaskInfo().setStatus(new TaskStatus(new Status(Status.STATUS_CODE_FAILURE, e.getMessage())));
 				return getTaskInfo().getStatus();
+			} else {
+				getTaskInfo().setStatus(new TaskStatus(new Status(Status.STATUS_CODE_ERROR, e.getMessage())));
+				return getTaskInfo().getStatus();
 			}
 		}
-		return null;
 	}
 	
 	public void setLayout(String layout) {
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/ServerSyncTask.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/ServerSyncTask.java
index 8d788925..59874ad6 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/ServerSyncTask.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/ServerSyncTask.java
@@ -1,44 +1,42 @@
-/**
- * ServerDiscoveryTask.java
- *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
+ * Gluster Management Gateway 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 Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.gateway.tasks;
+ *******************************************************************************/
+package org.gluster.storage.management.gateway.tasks;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.constants.GlusterConstants;
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.utils.GlusterCoreUtil;
+import org.gluster.storage.management.core.utils.ProcessResult;
+import org.gluster.storage.management.gateway.data.ClusterInfo;
+import org.gluster.storage.management.gateway.data.PersistenceDao;
+import org.gluster.storage.management.gateway.data.ServerInfo;
+import org.gluster.storage.management.gateway.services.ClusterService;
+import org.gluster.storage.management.gateway.services.DiscoveredServerService;
+import org.gluster.storage.management.gateway.services.GlusterServerService;
+import org.gluster.storage.management.gateway.utils.ServerUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.constants.GlusterConstants;
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.utils.GlusterCoreUtil;
-import com.gluster.storage.management.core.utils.ProcessResult;
-import com.gluster.storage.management.gateway.data.ClusterInfo;
-import com.gluster.storage.management.gateway.data.PersistenceDao;
-import com.gluster.storage.management.gateway.data.ServerInfo;
-import com.gluster.storage.management.gateway.services.ClusterService;
-import com.gluster.storage.management.gateway.services.DiscoveredServerService;
-import com.gluster.storage.management.gateway.services.GlusterServerService;
-import com.gluster.storage.management.gateway.utils.ServerUtil;
 
 /**
  * Task for syncing server details. This performs two things: <br>
@@ -140,7 +138,6 @@ public class ServerSyncTask {
 		return false;
 	}
 
-	@SuppressWarnings("unchecked")
 	private void discoverServers() {
 		if(discoveryMechanism.equals(GlusterConstants.NONE)) {
 			return;
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/Task.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/Task.java
index 1ba360bc..509e7803 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/Task.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/tasks/Task.java
@@ -1,30 +1,29 @@
-/**
- * Task.java
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.gateway.tasks;
+ *******************************************************************************/
+package org.gluster.storage.management.gateway.tasks;
+
+import org.gluster.storage.management.core.model.GlusterServer;
+import org.gluster.storage.management.core.model.TaskInfo;
+import org.gluster.storage.management.core.model.TaskStatus;
+import org.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
+import org.gluster.storage.management.gateway.services.ClusterService;
 
-import com.gluster.storage.management.core.model.GlusterServer;
-import com.gluster.storage.management.core.model.TaskInfo;
-import com.gluster.storage.management.core.model.TaskInfo.TASK_TYPE;
-import com.gluster.storage.management.core.model.TaskStatus;
-import com.gluster.storage.management.gateway.services.ClusterService;
 
 public abstract class Task {
 	public String[] TASK_TYPE_STR = { "Format Disk", "Migrate Brick", "Volume Rebalance" };
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/AbstractStatsFactory.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/AbstractStatsFactory.java
index 7f3045ba..685be651 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/AbstractStatsFactory.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/AbstractStatsFactory.java
@@ -1,32 +1,32 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.utils;
+package org.gluster.storage.management.gateway.utils;
 
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.ServerStats;
+import org.gluster.storage.management.core.model.ServerStatsRow;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.ServerStats;
-import com.gluster.storage.management.core.model.ServerStatsRow;
 
 /**
  *
diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/CpuStatsFactory.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/CpuStatsFactory.java
new file mode 100644
index 00000000..38c13a1d
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/CpuStatsFactory.java
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
+ *
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.gateway.utils;
+
+import org.springframework.stereotype.Component;
+
+/**
+ *
+ */
+@Component
+public class CpuStatsFactory extends AbstractStatsFactory {
+	
+	private static final String CPU_STATS_SCRIPT = "get_rrd_cpu_details.py";
+
+	@Override
+	public String getStatsScriptName() {
+		return CPU_STATS_SCRIPT;
+	}
+	
+}
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/DBUtil.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/DBUtil.java
index ca4821d1..5fa3a144 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/DBUtil.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/DBUtil.java
@@ -1,29 +1,29 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.utils;
+package org.gluster.storage.management.gateway.utils;
 
 import java.sql.DriverManager;
 import java.sql.SQLException;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.constants.CoreConstants;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/MemoryStatsFactory.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/MemoryStatsFactory.java
index dc88bf52..623d94eb 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/MemoryStatsFactory.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/MemoryStatsFactory.java
@@ -1,29 +1,29 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.utils;
+package org.gluster.storage.management.gateway.utils;
 
 import java.util.List;
 
+import org.gluster.storage.management.core.model.ServerStats;
+import org.gluster.storage.management.core.model.ServerStatsRow;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.model.ServerStats;
-import com.gluster.storage.management.core.model.ServerStatsRow;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/NetworkStatsFactory.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/NetworkStatsFactory.java
index fdc4b1d2..3f968251 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/NetworkStatsFactory.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/NetworkStatsFactory.java
@@ -1,36 +1,36 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.utils;
+package org.gluster.storage.management.gateway.utils;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.NetworkInterface;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.ServerStats;
+import org.gluster.storage.management.core.model.ServerStatsRow;
+import org.gluster.storage.management.core.utils.ProcessUtil;
 import org.springframework.stereotype.Component;
 
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.NetworkInterface;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.model.ServerStats;
-import com.gluster.storage.management.core.model.ServerStatsRow;
-import com.gluster.storage.management.core.utils.ProcessUtil;
 
 /**
  *
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/PasswordManager.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/PasswordManager.java
index 6af08049..11965299 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/PasswordManager.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/PasswordManager.java
@@ -1,30 +1,30 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.utils;
+package org.gluster.storage.management.gateway.utils;
 
 import org.apache.derby.jdbc.EmbeddedDriver;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.gateway.security.UserAuthDao;
 import org.springframework.jdbc.datasource.SimpleDriverDataSource;
 import org.springframework.security.authentication.dao.ReflectionSaltSource;
 import org.springframework.security.authentication.encoding.ShaPasswordEncoder;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.gateway.security.UserAuthDao;
 
 /**
  * Tool to reset password of default user gluster
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/ServerUtil.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/ServerUtil.java
index 0d09d616..4f7d125c 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/ServerUtil.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/ServerUtil.java
@@ -1,31 +1,31 @@
-/**
- * ServerUtil.java
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Gluster Management Gateway 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.
  *
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
  * <http://www.gnu.org/licenses/>.
- */
-package com.gluster.storage.management.gateway.utils;
+ *******************************************************************************/
+package org.gluster.storage.management.gateway.utils;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.servlet.ServletContext;
 import javax.xml.bind.JAXBContext;
@@ -33,20 +33,19 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.exceptions.ConnectionException;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.model.Server;
+import org.gluster.storage.management.core.model.Server.SERVER_STATUS;
+import org.gluster.storage.management.core.model.Status;
+import org.gluster.storage.management.core.utils.ProcessResult;
+import org.gluster.storage.management.core.utils.ProcessUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Component;
 import org.springframework.web.context.ContextLoader;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.exceptions.ConnectionException;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.model.Server.SERVER_STATUS;
-import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.utils.ProcessResult;
-import com.gluster.storage.management.core.utils.ProcessUtil;
-import com.gluster.storage.management.gateway.services.GlusterInterfaceService;
 
 @Component
 public class ServerUtil {
@@ -65,8 +64,10 @@ public class ServerUtil {
 	private static final String SCRIPT_COMMAND = "python";
 	private static final String REMOTE_SCRIPT_GET_DISK_FOR_DIR = "get_disk_for_dir.py";
 	private static final String REMOTE_SCRIPT_GET_SERVER_DETAILS = "get_server_details.py";
+	private static final String REMOTE_SCRIPT_GET_FILE_SYSTEM_TYPE = "get_filesystem_type.py";
 	private static final String REMOTE_SCRIPT_BASE_DIR = "/opt/glustermg";
 	private static final String REMOTE_SCRIPT_DIR_NAME = "backend";
+	private static final String ENV_GMG_VERSION = "GMG_VERSION";
 
 	public void setSshUtil(SshUtil sshUtil) {
 		this.sshUtil = sshUtil;
@@ -82,7 +83,12 @@ public class ServerUtil {
 		command.add(SCRIPT_COMMAND);
 		command.add(getScriptPath(scriptName));
 		command.addAll(arguments);
-		return ProcessUtil.executeCommand(runInForeground, command);
+		
+		// Set the Gateway Version number in an env variable which will be available to the script being executed.
+		Map<String, String> env = new HashMap<String, String>(1);
+		env.put(ENV_GMG_VERSION, appVersion);
+		
+		return ProcessUtil.executeCommand(runInForeground, command, env);
 	}
 
 	private String getScriptPath(String scriptName) {
@@ -360,4 +366,9 @@ public class ServerUtil {
 		ApplicationContext ctx = ContextLoader.getCurrentWebApplicationContext();
 		return ctx.getBean(clazz);
 	}
+	
+	public List<String> getFsTypes(String serverName) {
+		String output = executeScriptOnServer(serverName, REMOTE_SCRIPT_GET_FILE_SYSTEM_TYPE);
+		return Arrays.asList(output.trim().split(CoreConstants.NEWLINE));
+	}
 }
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/SshUtil.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/SshUtil.java
index 706fef31..ab3cdfea 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/SshUtil.java
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/SshUtil.java
@@ -1,22 +1,22 @@
 /*******************************************************************************
- * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
- * This file is part of Gluster Management Console.
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
  *
- * Gluster Management Console is free software; you can redistribute it and/or 
- * modify it under the terms of the GNU Affero General Public License as published
- * by the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *  
- * Gluster Management Console 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 Affero General Public License
- * for more details.
- *  
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
  *******************************************************************************/
-package com.gluster.storage.management.gateway.utils;
+package org.gluster.storage.management.gateway.utils;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -26,6 +26,12 @@ import java.io.InputStreamReader;
 import java.util.Arrays;
 
 import org.apache.log4j.Logger;
+import org.gluster.storage.management.core.constants.CoreConstants;
+import org.gluster.storage.management.core.exceptions.ConnectionException;
+import org.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import org.gluster.storage.management.core.utils.FileUtil;
+import org.gluster.storage.management.core.utils.LRUCache;
+import org.gluster.storage.management.core.utils.ProcessResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -35,12 +41,6 @@ import ch.ethz.ssh2.SCPClient;
 import ch.ethz.ssh2.Session;
 import ch.ethz.ssh2.StreamGobbler;
 
-import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.exceptions.ConnectionException;
-import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
-import com.gluster.storage.management.core.utils.FileUtil;
-import com.gluster.storage.management.core.utils.LRUCache;
-import com.gluster.storage.management.core.utils.ProcessResult;
 
 /**
  *
diff --git a/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/StatsFactory.java b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/StatsFactory.java
new file mode 100644
index 00000000..322b5f92
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/src/org/gluster/storage/management/gateway/utils/StatsFactory.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Gateway.
+ *
+ * Gluster Management Gateway 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.
+ *
+ * Gluster Management Gateway 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/>.
+ *******************************************************************************/
+package org.gluster.storage.management.gateway.utils;
+
+import java.util.List;
+
+import org.gluster.storage.management.core.model.ServerStats;
+
+
+/**
+ *
+ */
+public interface StatsFactory {
+	public ServerStats fetchStats(String serverName, String period, String...args);
+	public ServerStats fetchAggregatedStats(List<String> serverName, String period);
+}
diff --git a/src/org.gluster.storage.management.gateway/src/rebel.xml b/src/org.gluster.storage.management.gateway/src/rebel.xml
new file mode 100644
index 00000000..e2bf92a6
--- /dev/null
+++ b/src/org.gluster.storage.management.gateway/src/rebel.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+    This file is part of Gluster Management Gateway.
+   
+    Gluster Management Gateway 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.
+   
+    Gluster Management Gateway 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/>.
+ -->
+
+<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://www.zeroturnaround.com/alderaan/rebel-2_0.xsd">
+
+	<classpath>
+		<dir name="${rebel.workspace.path}/console/src/org.gluster.storage.management.gateway/WebContent/WEB-INF/classes">
+		</dir>
+	</classpath>
+
+	<web>
+		<link target="/">
+			<dir name="${rebel.workspace.path}/console/src/org.gluster.storage.management.gateway/WebContent">
+			</dir>
+		</link>
+	</web>
+
+</application>
diff --git a/src/com.gluster.storage.management.gateway/src/spring/gluster-server-base.xml b/src/org.gluster.storage.management.gateway/src/spring/gluster-server-base.xml
index 72eb0409..43a0aadb 100644
--- a/src/com.gluster.storage.management.gateway/src/spring/gluster-server-base.xml
+++ b/src/org.gluster.storage.management.gateway/src/spring/gluster-server-base.xml
@@ -1,3 +1,21 @@
+<!--
+    Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+    This file is part of Gluster Management Gateway.
+   
+    Gluster Management Gateway 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.
+   
+    Gluster Management Gateway 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/>.
+ -->
 
 <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context" xmlns:task="http://www.springframework.org/schema/task"
@@ -7,7 +25,7 @@
    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
    http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-3.0.xsd 
    http://www.springframework.org/schema/tx  http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
-	<context:component-scan base-package="com.gluster.storage.management.gateway" />
+	<context:component-scan base-package="org.gluster.storage.management.gateway" />
 	<task:scheduler id="taskScheduler" />
 	<task:executor id="taskExecutor" pool-size="1" />
 	<task:annotation-driven executor="taskExecutor" scheduler="taskScheduler" />
@@ -44,6 +62,11 @@
 	
 	<!-- Gluster Management Gateway Version -->
 	<bean id="appVersion" class="java.lang.String">
+		<constructor-arg value="@VERSION@" />
+	</bean>
+
+	<!-- Gluster Management Gateway Data Version -->
+	<bean id="dataVersion" class="java.lang.String">
 		<constructor-arg value="1.0.0" />
 	</bean>
 
@@ -69,19 +92,19 @@
 	<bean
         class="org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor" />
 
-	<bean id="clusterDao" class="com.gluster.storage.management.gateway.data.PersistenceDao">
+	<bean id="clusterDao" class="org.gluster.storage.management.gateway.data.PersistenceDao">
 		<constructor-arg type="java.lang.Class">
-			<value>com.gluster.storage.management.gateway.data.ClusterInfo</value>
+			<value>org.gluster.storage.management.gateway.data.ClusterInfo</value>
 		</constructor-arg>
 	</bean>
 
-	<bean id="serverDao" class="com.gluster.storage.management.gateway.data.PersistenceDao">
+	<bean id="serverDao" class="org.gluster.storage.management.gateway.data.PersistenceDao">
 		<constructor-arg type="java.lang.Class">
-			<value>com.gluster.storage.management.gateway.data.ServerInfo</value>
+			<value>org.gluster.storage.management.gateway.data.ServerInfo</value>
 		</constructor-arg>
 	</bean>
 	
-	<!-- bean id="dataSourceFactory" class="com.gluster.storage.management.gateway.data.GlusterDataSource" />
+	<!-- bean id="dataSourceFactory" class="org.gluster.storage.management.gateway.data.GlusterDataSource" />
 		<bean id="dataSource" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
 		<property name="targetObject">
 		<ref local="dataSourceFactory" />
@@ -91,10 +114,10 @@
 		</property>
 		</bean -->
 
-	<!-- bean id="dataSource" class="com.gluster.storage.management.gateway.data.GlusterDataSource"
+	<!-- bean id="dataSource" class="org.gluster.storage.management.gateway.data.GlusterDataSource"
 		lazy-init="false" autowire="byType" / -->
 
-	<bean class="com.gluster.storage.management.gateway.tasks.InitServerTask" init-method="initServer" depends-on="dataSource">
+	<bean class="org.gluster.storage.management.gateway.tasks.InitServerTask" init-method="initServer" depends-on="dataSource">
 		<property name="dataSource" ref="dataSource" />
 	</bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/src/com.gluster.storage.management.gateway/src/spring/gluster-server-security.xml b/src/org.gluster.storage.management.gateway/src/spring/gluster-server-security.xml
index e160d31a..b4ff49cf 100644
--- a/src/com.gluster.storage.management.gateway/src/spring/gluster-server-security.xml
+++ b/src/org.gluster.storage.management.gateway/src/spring/gluster-server-security.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2006-2011 Gluster, Inc. <http://www.gluster.com>
+    This file is part of Gluster Management Gateway.
+   
+    Gluster Management Gateway 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.
+   
+    Gluster Management Gateway 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/>.
+ -->
+
 <beans:beans xmlns="http://www.springframework.org/schema/security"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
 	xmlns:jdbc="http://www.springframework.org/schema/jdbc"
@@ -46,4 +65,4 @@
 		<beans:property name="dataSource" ref="dataSource" />
 		<beans:property name="authenticationManager" ref="authenticationManager" />
 	</beans:bean>
-</beans:beans>
\ No newline at end of file
+</beans:beans>