diff --git a/README.md b/README.md
index fb3c5890..99afe57a 100644
--- a/README.md
+++ b/README.md
@@ -51,3 +51,39 @@ docker stop $(docker ps -a -q) && systemctl stop docker && shutdown -r +2 "The s
 ``
 
 May it's neccessary to restart some of the the docker containers manual afterwards. 
+
+
+# Client Playbook
+[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)
+
+Playbook to setup Manjaro GNOME clients in integration with a server which is configured with the [Server Playbook Software](https://github.com/kevinveenbirkenbach/server-playbook).
+
+## Included Applications
+- [Basic Linux Administration Tools](./roles/collection-administrator-base/)
+- [Network Analyzes Tools](./roles/collection-administrator-network-analyze/)
+- [Designer Tools](./roles/collection-designer/)
+- [Arduino Developer Tools](./roles/collection-developer-arduino/)
+- [Basic Developer Tools](./roles/collection-developer-base/)
+- [Bash Developer Tools](./roles/collection-developer-bash/)
+- [Java Developer Tools](./roles/collection-developer-java/)
+- [PHP Developer Tools](./roles/collection-developer-php/)
+- [Python Developer Tools](./roles/collection-developer-python/)
+- [Entertainment Software](./roles/collection-entertainment/)
+- [Games](./roles/collection-games/)
+- [Office Tools](./roles/collection-office/)
+- [Streaming Tools](./roles/collection-streamer/)
+- [Torrent Software](./roles/collection-torrent/)
+- ...
+
+## Setup
+
+Run:
+```bash
+ansible-galaxy collection install -r requirements.yml
+```
+
+## See
+- https://www.middlewareinventory.com/blog/run-ansible-playbook-locally/
+- https://stackoverflow.com/questions/30533372/run-an-ansible-task-only-when-the-hostname-contains-a-string
+- https://archived.forum.manjaro.org/t/running-android-applications-on-arch-using-anbox/53332
+- https://www.reddit.com/r/ManjaroLinux/comments/cbkblb/guide_run_android_apps_on_manjaro_super_simple/ 
diff --git a/client-playbook/LICENSE b/client-playbook/LICENSE
deleted file mode 100644
index 0ad25db4..00000000
--- a/client-playbook/LICENSE
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are 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.
-
-  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.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  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 work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero 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 Affero 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 Affero 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 Affero 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 Affero 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 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 <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  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 AGPL, see
-<https://www.gnu.org/licenses/>.
diff --git a/client-playbook/README.md b/client-playbook/README.md
deleted file mode 100644
index fccd5a35..00000000
--- a/client-playbook/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Client Playbook
-[![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)
-
-Playbook to setup Manjaro GNOME clients in integration with a server which is configured with the [Server Playbook Software](https://github.com/kevinveenbirkenbach/server-playbook).
-
-## Included Applications
-- [Basic Linux Administration Tools](./roles/collection-administrator-base/)
-- [Network Analyzes Tools](./roles/collection-administrator-network-analyze/)
-- [Designer Tools](./roles/collection-designer/)
-- [Arduino Developer Tools](./roles/collection-developer-arduino/)
-- [Basic Developer Tools](./roles/collection-developer-base/)
-- [Bash Developer Tools](./roles/collection-developer-bash/)
-- [Java Developer Tools](./roles/collection-developer-java/)
-- [PHP Developer Tools](./roles/collection-developer-php/)
-- [Python Developer Tools](./roles/collection-developer-python/)
-- [Entertainment Software](./roles/collection-entertainment/)
-- [Games](./roles/collection-games/)
-- [Office Tools](./roles/collection-office/)
-- [Streaming Tools](./roles/collection-streamer/)
-- [Torrent Software](./roles/collection-torrent/)
-- ...
-
-## Setup
-
-Run:
-```bash
-ansible-galaxy collection install -r requirements.yml
-```
-
-
-## See
-- https://www.middlewareinventory.com/blog/run-ansible-playbook-locally/
-- https://stackoverflow.com/questions/30533372/run-an-ansible-task-only-when-the-hostname-contains-a-string
-- https://archived.forum.manjaro.org/t/running-android-applications-on-arch-using-anbox/53332
-- https://www.reddit.com/r/ManjaroLinux/comments/cbkblb/guide_run_android_apps_on_manjaro_super_simple/ 
diff --git a/client-playbook/playbook.yml b/client-playbook/playbook.yml
deleted file mode 100644
index 5740ae85..00000000
--- a/client-playbook/playbook.yml
+++ /dev/null
@@ -1,115 +0,0 @@
-- name: general host setup
-  hosts: all
-  become: true
-  roles:
-    - system-pacman
-    - collection-administrator-base
-    - driver-non-free
-
-- name: application-wireguard
-  hosts: application_wireguard_hosts
-  become: true
-  roles:
-    - application-wireguard
-
-- name: collection-office
-  hosts: collection_officetools_hosts
-  become: true
-  roles:
-    - collection-office
-
-- name: collection-designer
-  hosts: collection_designer_hosts
-  become: true
-  roles:
-    - collection-designer
-
-- name: collection-torrent
-  hosts: collection_torrent_hosts
-  become: true
-  roles:
-    - collection-torrent
-
-- name: collection-streamer
-  hosts: collection_streamer_hosts
-  become: true
-  roles:
-    - collection-streamer
-
-- name: collection-bluray-player
-  hosts: collection_bluray_player_hosts
-  become: true
-  roles:
-    - collection-bluray-player
-
-- name: driver-intel
-  hosts: intel_hosts
-  become: true
-  roles:
-    - driver-intel
-
-- name: application-latex
-  hosts: latex_hosts
-  become: true
-  roles:
-    - application-latex
-
-- name: GNOME setup
-  hosts: gnome_hosts
-  become: true
-  roles:
-    - system-gnome
-
-- name: setup msi rgb keyboard
-  hosts: msi_perkeyrgb_hosts
-  become: true
-  roles:
-    - driver-msi-perkeyrgb
-
-- name: setup ssh hosts
-  hosts: ssh_hosts
-  become: false
-  roles:
-    - application-ssh
-
-- name: setup swapfile hosts
-  hosts: swapfile_hosts
-  become: false
-  roles:
-    - system-swapfile
-
-- name: setup gaming hosts
-  hosts: gaming_hosts
-  become: true
-  roles:
-    - collection-games
-
-- name: setup entertainment hosts
-  hosts: entertainment_hosts
-  become: true
-  roles:
-    - collection-entertainment
-
-- name: setup multiprinter hosts
-  hosts: epson_multiprinter_hosts
-  become: true
-  roles:
-    - driver-epson-multiprinter
-
-- name: setup torbrowser hosts
-  hosts: torbrowser_hosts
-  become: true
-  roles:
-    - application-torbrowser
-
-- name: setup nextcloud
-  hosts: nextcloud_hosts
-  become: true
-  roles:
-    - application-nextcloud
-
-- name: setup docker
-  hosts: docker_hosts
-  become: true
-  roles:
-    - application-docker
diff --git a/client-playbook/requirements.yml b/pc_requirements.yml
similarity index 100%
rename from client-playbook/requirements.yml
rename to pc_requirements.yml
diff --git a/playbook.yml b/playbook.yml
index a513831d..b670b31f 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -171,3 +171,120 @@
   become: true
   roles:
     - role: native-pull-primary-backups
+
+## PC services
+- name: general host setup
+  hosts: all
+  become: true
+  roles:
+    - system-pacman
+    - collection-administrator-base
+    - driver-non-free
+
+- name: application-wireguard
+  hosts: application_wireguard_hosts
+  become: true
+  roles:
+    - application-wireguard
+
+- name: collection-office
+  hosts: collection_officetools_hosts
+  become: true
+  roles:
+    - collection-office
+
+- name: collection-designer
+  hosts: collection_designer_hosts
+  become: true
+  roles:
+    - collection-designer
+
+- name: collection-torrent
+  hosts: collection_torrent_hosts
+  become: true
+  roles:
+    - collection-torrent
+
+- name: collection-streamer
+  hosts: collection_streamer_hosts
+  become: true
+  roles:
+    - collection-streamer
+
+- name: collection-bluray-player
+  hosts: collection_bluray_player_hosts
+  become: true
+  roles:
+    - collection-bluray-player
+
+- name: driver-intel
+  hosts: intel_hosts
+  become: true
+  roles:
+    - driver-intel
+
+- name: application-latex
+  hosts: latex_hosts
+  become: true
+  roles:
+    - application-latex
+
+- name: GNOME setup
+  hosts: gnome_hosts
+  become: true
+  roles:
+    - system-gnome
+
+- name: setup msi rgb keyboard
+  hosts: msi_perkeyrgb_hosts
+  become: true
+  roles:
+    - driver-msi-perkeyrgb
+
+- name: setup ssh hosts
+  hosts: ssh_hosts
+  become: false
+  roles:
+    - application-ssh
+
+- name: setup swapfile hosts
+  hosts: swapfile_hosts
+  become: false
+  roles:
+    - system-swapfile
+
+- name: setup gaming hosts
+  hosts: gaming_hosts
+  become: true
+  roles:
+    - collection-games
+
+- name: setup entertainment hosts
+  hosts: entertainment_hosts
+  become: true
+  roles:
+    - collection-entertainment
+
+- name: setup multiprinter hosts
+  hosts: epson_multiprinter_hosts
+  become: true
+  roles:
+    - driver-epson-multiprinter
+
+- name: setup torbrowser hosts
+  hosts: torbrowser_hosts
+  become: true
+  roles:
+    - application-torbrowser
+
+- name: setup nextcloud
+  hosts: nextcloud_hosts
+  become: true
+  roles:
+    - application-nextcloud
+
+- name: setup docker
+  hosts: docker_hosts
+  become: true
+  roles:
+    - application-docker
diff --git a/client-playbook/roles/application-caffeine/meta/main.yml b/roles/pc_application-caffeine/meta/main.yml
similarity index 100%
rename from client-playbook/roles/application-caffeine/meta/main.yml
rename to roles/pc_application-caffeine/meta/main.yml
diff --git a/client-playbook/roles/application-caffeine/tasks/main.yml b/roles/pc_application-caffeine/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/application-caffeine/tasks/main.yml
rename to roles/pc_application-caffeine/tasks/main.yml
diff --git a/client-playbook/roles/application-docker/tasks/main.yml b/roles/pc_application-docker/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/application-docker/tasks/main.yml
rename to roles/pc_application-docker/tasks/main.yml
diff --git a/client-playbook/roles/application-git/tasks/main.yml b/roles/pc_application-git/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/application-git/tasks/main.yml
rename to roles/pc_application-git/tasks/main.yml
diff --git a/client-playbook/roles/application-hunspell/tasks/main.yml b/roles/pc_application-hunspell/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/application-hunspell/tasks/main.yml
rename to roles/pc_application-hunspell/tasks/main.yml
diff --git a/client-playbook/roles/application-java/tasks/main.yml b/roles/pc_application-java/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/application-java/tasks/main.yml
rename to roles/pc_application-java/tasks/main.yml
diff --git a/client-playbook/roles/application-latex/readme.md b/roles/pc_application-latex/readme.md
similarity index 100%
rename from client-playbook/roles/application-latex/readme.md
rename to roles/pc_application-latex/readme.md
diff --git a/client-playbook/roles/application-latex/tasks/main.yml b/roles/pc_application-latex/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/application-latex/tasks/main.yml
rename to roles/pc_application-latex/tasks/main.yml
diff --git a/client-playbook/roles/application-libreoffice/meta/main.yml b/roles/pc_application-libreoffice/meta/main.yml
similarity index 100%
rename from client-playbook/roles/application-libreoffice/meta/main.yml
rename to roles/pc_application-libreoffice/meta/main.yml
diff --git a/client-playbook/roles/application-libreoffice/tasks/main.yml b/roles/pc_application-libreoffice/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/application-libreoffice/tasks/main.yml
rename to roles/pc_application-libreoffice/tasks/main.yml
diff --git a/client-playbook/roles/application-nextcloud/tasks/main.yml b/roles/pc_application-nextcloud/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/application-nextcloud/tasks/main.yml
rename to roles/pc_application-nextcloud/tasks/main.yml
diff --git a/client-playbook/roles/application-nextcloud/vars/main.yml b/roles/pc_application-nextcloud/vars/main.yml
similarity index 100%
rename from client-playbook/roles/application-nextcloud/vars/main.yml
rename to roles/pc_application-nextcloud/vars/main.yml
diff --git a/client-playbook/roles/application-ssh/meta/main.yml b/roles/pc_application-ssh/meta/main.yml
similarity index 100%
rename from client-playbook/roles/application-ssh/meta/main.yml
rename to roles/pc_application-ssh/meta/main.yml
diff --git a/client-playbook/roles/application-ssh/tasks/main.yml b/roles/pc_application-ssh/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/application-ssh/tasks/main.yml
rename to roles/pc_application-ssh/tasks/main.yml
diff --git a/client-playbook/roles/application-torbrowser/tasks/main.yml b/roles/pc_application-torbrowser/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/application-torbrowser/tasks/main.yml
rename to roles/pc_application-torbrowser/tasks/main.yml
diff --git a/client-playbook/roles/application-virtual-box/Readme.md b/roles/pc_application-virtual-box/Readme.md
similarity index 100%
rename from client-playbook/roles/application-virtual-box/Readme.md
rename to roles/pc_application-virtual-box/Readme.md
diff --git a/client-playbook/roles/application-wireguard/README.md b/roles/pc_application-wireguard/README.md
similarity index 100%
rename from client-playbook/roles/application-wireguard/README.md
rename to roles/pc_application-wireguard/README.md
diff --git a/client-playbook/roles/application-wireguard/files/set-mtu.service b/roles/pc_application-wireguard/files/set-mtu.service
similarity index 100%
rename from client-playbook/roles/application-wireguard/files/set-mtu.service
rename to roles/pc_application-wireguard/files/set-mtu.service
diff --git a/client-playbook/roles/application-wireguard/files/wireguard-ip.conf b/roles/pc_application-wireguard/files/wireguard-ip.conf
similarity index 100%
rename from client-playbook/roles/application-wireguard/files/wireguard-ip.conf
rename to roles/pc_application-wireguard/files/wireguard-ip.conf
diff --git a/client-playbook/roles/application-wireguard/handlers/main.yml b/roles/pc_application-wireguard/handlers/main.yml
similarity index 100%
rename from client-playbook/roles/application-wireguard/handlers/main.yml
rename to roles/pc_application-wireguard/handlers/main.yml
diff --git a/client-playbook/roles/application-wireguard/tasks/main.yml b/roles/pc_application-wireguard/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/application-wireguard/tasks/main.yml
rename to roles/pc_application-wireguard/tasks/main.yml
diff --git a/client-playbook/roles/application-wireguard/templates/set-mtu.sh.j2 b/roles/pc_application-wireguard/templates/set-mtu.sh.j2
similarity index 100%
rename from client-playbook/roles/application-wireguard/templates/set-mtu.sh.j2
rename to roles/pc_application-wireguard/templates/set-mtu.sh.j2
diff --git a/client-playbook/roles/collection-administrator-base/meta/main.yml b/roles/pc_collection-administrator-base/meta/main.yml
similarity index 100%
rename from client-playbook/roles/collection-administrator-base/meta/main.yml
rename to roles/pc_collection-administrator-base/meta/main.yml
diff --git a/client-playbook/roles/collection-administrator-base/tasks/main.yml b/roles/pc_collection-administrator-base/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/collection-administrator-base/tasks/main.yml
rename to roles/pc_collection-administrator-base/tasks/main.yml
diff --git a/client-playbook/roles/collection-administrator-network-analyze/meta/main.yml b/roles/pc_collection-administrator-network-analyze/meta/main.yml
similarity index 100%
rename from client-playbook/roles/collection-administrator-network-analyze/meta/main.yml
rename to roles/pc_collection-administrator-network-analyze/meta/main.yml
diff --git a/client-playbook/roles/collection-administrator-network-analyze/tasks/main.yml b/roles/pc_collection-administrator-network-analyze/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/collection-administrator-network-analyze/tasks/main.yml
rename to roles/pc_collection-administrator-network-analyze/tasks/main.yml
diff --git a/client-playbook/roles/collection-bluray-player/meta/main.yml b/roles/pc_collection-bluray-player/meta/main.yml
similarity index 100%
rename from client-playbook/roles/collection-bluray-player/meta/main.yml
rename to roles/pc_collection-bluray-player/meta/main.yml
diff --git a/client-playbook/roles/collection-bluray-player/readme.md b/roles/pc_collection-bluray-player/readme.md
similarity index 100%
rename from client-playbook/roles/collection-bluray-player/readme.md
rename to roles/pc_collection-bluray-player/readme.md
diff --git a/client-playbook/roles/collection-bluray-player/tasks/main.yml b/roles/pc_collection-bluray-player/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/collection-bluray-player/tasks/main.yml
rename to roles/pc_collection-bluray-player/tasks/main.yml
diff --git a/client-playbook/roles/collection-designer/meta/main.yml b/roles/pc_collection-designer/meta/main.yml
similarity index 100%
rename from client-playbook/roles/collection-designer/meta/main.yml
rename to roles/pc_collection-designer/meta/main.yml
diff --git a/client-playbook/roles/collection-designer/tasks/main.yml b/roles/pc_collection-designer/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/collection-designer/tasks/main.yml
rename to roles/pc_collection-designer/tasks/main.yml
diff --git a/client-playbook/roles/collection-developer-arduino/meta/main.yml b/roles/pc_collection-developer-arduino/meta/main.yml
similarity index 100%
rename from client-playbook/roles/collection-developer-arduino/meta/main.yml
rename to roles/pc_collection-developer-arduino/meta/main.yml
diff --git a/client-playbook/roles/collection-developer-arduino/tasks/main.yml b/roles/pc_collection-developer-arduino/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/collection-developer-arduino/tasks/main.yml
rename to roles/pc_collection-developer-arduino/tasks/main.yml
diff --git a/client-playbook/roles/collection-developer-base/meta/main.yml b/roles/pc_collection-developer-base/meta/main.yml
similarity index 100%
rename from client-playbook/roles/collection-developer-base/meta/main.yml
rename to roles/pc_collection-developer-base/meta/main.yml
diff --git a/client-playbook/roles/collection-developer-base/tasks/main.yml b/roles/pc_collection-developer-base/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/collection-developer-base/tasks/main.yml
rename to roles/pc_collection-developer-base/tasks/main.yml
diff --git a/client-playbook/roles/collection-developer-bash/meta/main.yml b/roles/pc_collection-developer-bash/meta/main.yml
similarity index 100%
rename from client-playbook/roles/collection-developer-bash/meta/main.yml
rename to roles/pc_collection-developer-bash/meta/main.yml
diff --git a/client-playbook/roles/collection-developer-bash/tasks/main.yml b/roles/pc_collection-developer-bash/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/collection-developer-bash/tasks/main.yml
rename to roles/pc_collection-developer-bash/tasks/main.yml
diff --git a/client-playbook/roles/collection-developer-java/meta/main.yml b/roles/pc_collection-developer-java/meta/main.yml
similarity index 100%
rename from client-playbook/roles/collection-developer-java/meta/main.yml
rename to roles/pc_collection-developer-java/meta/main.yml
diff --git a/client-playbook/roles/collection-developer-php/meta/main.yml b/roles/pc_collection-developer-php/meta/main.yml
similarity index 100%
rename from client-playbook/roles/collection-developer-php/meta/main.yml
rename to roles/pc_collection-developer-php/meta/main.yml
diff --git a/client-playbook/roles/collection-developer-php/tasks/main.yml b/roles/pc_collection-developer-php/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/collection-developer-php/tasks/main.yml
rename to roles/pc_collection-developer-php/tasks/main.yml
diff --git a/client-playbook/roles/collection-developer-python/meta/main.yml b/roles/pc_collection-developer-python/meta/main.yml
similarity index 100%
rename from client-playbook/roles/collection-developer-python/meta/main.yml
rename to roles/pc_collection-developer-python/meta/main.yml
diff --git a/client-playbook/roles/collection-developer-python/tasks/main.yml b/roles/pc_collection-developer-python/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/collection-developer-python/tasks/main.yml
rename to roles/pc_collection-developer-python/tasks/main.yml
diff --git a/client-playbook/roles/collection-entertainment/meta/main.yml b/roles/pc_collection-entertainment/meta/main.yml
similarity index 100%
rename from client-playbook/roles/collection-entertainment/meta/main.yml
rename to roles/pc_collection-entertainment/meta/main.yml
diff --git a/client-playbook/roles/collection-entertainment/tasks/main.yml b/roles/pc_collection-entertainment/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/collection-entertainment/tasks/main.yml
rename to roles/pc_collection-entertainment/tasks/main.yml
diff --git a/client-playbook/roles/collection-games/tasks/main.yml b/roles/pc_collection-games/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/collection-games/tasks/main.yml
rename to roles/pc_collection-games/tasks/main.yml
diff --git a/client-playbook/roles/collection-office/meta/main.yml b/roles/pc_collection-office/meta/main.yml
similarity index 100%
rename from client-playbook/roles/collection-office/meta/main.yml
rename to roles/pc_collection-office/meta/main.yml
diff --git a/client-playbook/roles/collection-office/tasks/main.yml b/roles/pc_collection-office/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/collection-office/tasks/main.yml
rename to roles/pc_collection-office/tasks/main.yml
diff --git a/client-playbook/roles/collection-security-tools/tasks/main.yml b/roles/pc_collection-security-tools/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/collection-security-tools/tasks/main.yml
rename to roles/pc_collection-security-tools/tasks/main.yml
diff --git a/client-playbook/roles/collection-streamer/tasks/main.yml b/roles/pc_collection-streamer/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/collection-streamer/tasks/main.yml
rename to roles/pc_collection-streamer/tasks/main.yml
diff --git a/client-playbook/roles/collection-torrent/meta/main.yml b/roles/pc_collection-torrent/meta/main.yml
similarity index 100%
rename from client-playbook/roles/collection-torrent/meta/main.yml
rename to roles/pc_collection-torrent/meta/main.yml
diff --git a/client-playbook/roles/collection-torrent/tasks/main.yml b/roles/pc_collection-torrent/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/collection-torrent/tasks/main.yml
rename to roles/pc_collection-torrent/tasks/main.yml
diff --git a/client-playbook/roles/collection-video-conference/README.md b/roles/pc_collection-video-conference/README.md
similarity index 100%
rename from client-playbook/roles/collection-video-conference/README.md
rename to roles/pc_collection-video-conference/README.md
diff --git a/client-playbook/roles/collection-video-conference/meta/main.yml b/roles/pc_collection-video-conference/meta/main.yml
similarity index 100%
rename from client-playbook/roles/collection-video-conference/meta/main.yml
rename to roles/pc_collection-video-conference/meta/main.yml
diff --git a/client-playbook/roles/collection-video-conference/tasks/main.yml b/roles/pc_collection-video-conference/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/collection-video-conference/tasks/main.yml
rename to roles/pc_collection-video-conference/tasks/main.yml
diff --git a/client-playbook/roles/driver-epson-multiprinter/Readme.md b/roles/pc_driver-epson-multiprinter/Readme.md
similarity index 100%
rename from client-playbook/roles/driver-epson-multiprinter/Readme.md
rename to roles/pc_driver-epson-multiprinter/Readme.md
diff --git a/client-playbook/roles/driver-epson-multiprinter/meta/main.yml b/roles/pc_driver-epson-multiprinter/meta/main.yml
similarity index 100%
rename from client-playbook/roles/driver-epson-multiprinter/meta/main.yml
rename to roles/pc_driver-epson-multiprinter/meta/main.yml
diff --git a/client-playbook/roles/driver-epson-multiprinter/tasks/main.yml b/roles/pc_driver-epson-multiprinter/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/driver-epson-multiprinter/tasks/main.yml
rename to roles/pc_driver-epson-multiprinter/tasks/main.yml
diff --git a/client-playbook/roles/driver-intel/Readme.md b/roles/pc_driver-intel/Readme.md
similarity index 100%
rename from client-playbook/roles/driver-intel/Readme.md
rename to roles/pc_driver-intel/Readme.md
diff --git a/client-playbook/roles/driver-intel/tasks/main.yml b/roles/pc_driver-intel/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/driver-intel/tasks/main.yml
rename to roles/pc_driver-intel/tasks/main.yml
diff --git a/client-playbook/roles/driver-msi-perkeyrgb/Readme.md b/roles/pc_driver-msi-perkeyrgb/Readme.md
similarity index 100%
rename from client-playbook/roles/driver-msi-perkeyrgb/Readme.md
rename to roles/pc_driver-msi-perkeyrgb/Readme.md
diff --git a/client-playbook/roles/driver-msi-perkeyrgb/meta/main.yml b/roles/pc_driver-msi-perkeyrgb/meta/main.yml
similarity index 100%
rename from client-playbook/roles/driver-msi-perkeyrgb/meta/main.yml
rename to roles/pc_driver-msi-perkeyrgb/meta/main.yml
diff --git a/client-playbook/roles/driver-msi-perkeyrgb/tasks/main.yml b/roles/pc_driver-msi-perkeyrgb/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/driver-msi-perkeyrgb/tasks/main.yml
rename to roles/pc_driver-msi-perkeyrgb/tasks/main.yml
diff --git a/client-playbook/roles/driver-non-free/tasks/main.yml b/roles/pc_driver-non-free/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/driver-non-free/tasks/main.yml
rename to roles/pc_driver-non-free/tasks/main.yml
diff --git a/client-playbook/roles/system-aur-helper/Readme.md b/roles/pc_system-aur-helper/Readme.md
similarity index 100%
rename from client-playbook/roles/system-aur-helper/Readme.md
rename to roles/pc_system-aur-helper/Readme.md
diff --git a/client-playbook/roles/system-aur-helper/tasks/main.yml b/roles/pc_system-aur-helper/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/system-aur-helper/tasks/main.yml
rename to roles/pc_system-aur-helper/tasks/main.yml
diff --git a/client-playbook/roles/system-gnome/Readme.md b/roles/pc_system-gnome/Readme.md
similarity index 100%
rename from client-playbook/roles/system-gnome/Readme.md
rename to roles/pc_system-gnome/Readme.md
diff --git a/client-playbook/roles/system-gnome/meta/main.yml b/roles/pc_system-gnome/meta/main.yml
similarity index 100%
rename from client-playbook/roles/system-gnome/meta/main.yml
rename to roles/pc_system-gnome/meta/main.yml
diff --git a/client-playbook/roles/system-gnome/tasks/main.yml b/roles/pc_system-gnome/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/system-gnome/tasks/main.yml
rename to roles/pc_system-gnome/tasks/main.yml
diff --git a/client-playbook/roles/system-pacman/tasks/main.yml b/roles/pc_system-pacman/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/system-pacman/tasks/main.yml
rename to roles/pc_system-pacman/tasks/main.yml
diff --git a/client-playbook/roles/system-swapfile/meta/main.yml b/roles/pc_system-swapfile/meta/main.yml
similarity index 100%
rename from client-playbook/roles/system-swapfile/meta/main.yml
rename to roles/pc_system-swapfile/meta/main.yml
diff --git a/client-playbook/roles/system-swapfile/tasks/main.yml b/roles/pc_system-swapfile/tasks/main.yml
similarity index 100%
rename from client-playbook/roles/system-swapfile/tasks/main.yml
rename to roles/pc_system-swapfile/tasks/main.yml
diff --git a/roles/docker-akaunting/README.md b/roles/server_docker-akaunting/README.md
similarity index 100%
rename from roles/docker-akaunting/README.md
rename to roles/server_docker-akaunting/README.md
diff --git a/roles/docker-akaunting/handlers/main.yml b/roles/server_docker-akaunting/handlers/main.yml
similarity index 100%
rename from roles/docker-akaunting/handlers/main.yml
rename to roles/server_docker-akaunting/handlers/main.yml
diff --git a/roles/docker-akaunting/meta/main.yml b/roles/server_docker-akaunting/meta/main.yml
similarity index 100%
rename from roles/docker-akaunting/meta/main.yml
rename to roles/server_docker-akaunting/meta/main.yml
diff --git a/roles/docker-akaunting/tasks/main.yml b/roles/server_docker-akaunting/tasks/main.yml
similarity index 100%
rename from roles/docker-akaunting/tasks/main.yml
rename to roles/server_docker-akaunting/tasks/main.yml
diff --git a/roles/docker-akaunting/templates/db.env.j2 b/roles/server_docker-akaunting/templates/db.env.j2
similarity index 100%
rename from roles/docker-akaunting/templates/db.env.j2
rename to roles/server_docker-akaunting/templates/db.env.j2
diff --git a/roles/docker-akaunting/templates/run.env.j2 b/roles/server_docker-akaunting/templates/run.env.j2
similarity index 100%
rename from roles/docker-akaunting/templates/run.env.j2
rename to roles/server_docker-akaunting/templates/run.env.j2
diff --git a/roles/docker-akaunting/vars/main.yml b/roles/server_docker-akaunting/vars/main.yml
similarity index 100%
rename from roles/docker-akaunting/vars/main.yml
rename to roles/server_docker-akaunting/vars/main.yml
diff --git a/roles/docker-bigbluebutton/README.md b/roles/server_docker-bigbluebutton/README.md
similarity index 100%
rename from roles/docker-bigbluebutton/README.md
rename to roles/server_docker-bigbluebutton/README.md
diff --git a/roles/docker-bigbluebutton/handlers/main.yml b/roles/server_docker-bigbluebutton/handlers/main.yml
similarity index 100%
rename from roles/docker-bigbluebutton/handlers/main.yml
rename to roles/server_docker-bigbluebutton/handlers/main.yml
diff --git a/roles/docker-bigbluebutton/meta/main.yml b/roles/server_docker-bigbluebutton/meta/main.yml
similarity index 100%
rename from roles/docker-bigbluebutton/meta/main.yml
rename to roles/server_docker-bigbluebutton/meta/main.yml
diff --git a/roles/docker-bigbluebutton/tasks/main.yml b/roles/server_docker-bigbluebutton/tasks/main.yml
similarity index 100%
rename from roles/docker-bigbluebutton/tasks/main.yml
rename to roles/server_docker-bigbluebutton/tasks/main.yml
diff --git a/roles/docker-bigbluebutton/templates/env.j2 b/roles/server_docker-bigbluebutton/templates/env.j2
similarity index 100%
rename from roles/docker-bigbluebutton/templates/env.j2
rename to roles/server_docker-bigbluebutton/templates/env.j2
diff --git a/roles/docker-bigbluebutton/templates/nginx-proxy.conf.j2 b/roles/server_docker-bigbluebutton/templates/nginx-proxy.conf.j2
similarity index 100%
rename from roles/docker-bigbluebutton/templates/nginx-proxy.conf.j2
rename to roles/server_docker-bigbluebutton/templates/nginx-proxy.conf.j2
diff --git a/roles/docker-bigbluebutton/vars/main.yml b/roles/server_docker-bigbluebutton/vars/main.yml
similarity index 100%
rename from roles/docker-bigbluebutton/vars/main.yml
rename to roles/server_docker-bigbluebutton/vars/main.yml
diff --git a/roles/docker-elk/Readme.md b/roles/server_docker-elk/Readme.md
similarity index 100%
rename from roles/docker-elk/Readme.md
rename to roles/server_docker-elk/Readme.md
diff --git a/roles/docker-elk/defaults/main.yml b/roles/server_docker-elk/defaults/main.yml
similarity index 100%
rename from roles/docker-elk/defaults/main.yml
rename to roles/server_docker-elk/defaults/main.yml
diff --git a/roles/docker-elk/files/elasticsearch-sysctl.conf b/roles/server_docker-elk/files/elasticsearch-sysctl.conf
similarity index 100%
rename from roles/docker-elk/files/elasticsearch-sysctl.conf
rename to roles/server_docker-elk/files/elasticsearch-sysctl.conf
diff --git a/roles/docker-elk/handlers/main.yml b/roles/server_docker-elk/handlers/main.yml
similarity index 100%
rename from roles/docker-elk/handlers/main.yml
rename to roles/server_docker-elk/handlers/main.yml
diff --git a/roles/docker-elk/meta/main.yml b/roles/server_docker-elk/meta/main.yml
similarity index 100%
rename from roles/docker-elk/meta/main.yml
rename to roles/server_docker-elk/meta/main.yml
diff --git a/roles/docker-elk/tasks/main.yml b/roles/server_docker-elk/tasks/main.yml
similarity index 100%
rename from roles/docker-elk/tasks/main.yml
rename to roles/server_docker-elk/tasks/main.yml
diff --git a/roles/docker-elk/templates/docker-compose.yml.j2 b/roles/server_docker-elk/templates/docker-compose.yml.j2
similarity index 100%
rename from roles/docker-elk/templates/docker-compose.yml.j2
rename to roles/server_docker-elk/templates/docker-compose.yml.j2
diff --git a/roles/docker-elk/templates/elasticsearch.yml.j2 b/roles/server_docker-elk/templates/elasticsearch.yml.j2
similarity index 100%
rename from roles/docker-elk/templates/elasticsearch.yml.j2
rename to roles/server_docker-elk/templates/elasticsearch.yml.j2
diff --git a/roles/docker-elk/templates/kibana.yml.j2 b/roles/server_docker-elk/templates/kibana.yml.j2
similarity index 100%
rename from roles/docker-elk/templates/kibana.yml.j2
rename to roles/server_docker-elk/templates/kibana.yml.j2
diff --git a/roles/docker-elk/templates/logstash.conf.j2 b/roles/server_docker-elk/templates/logstash.conf.j2
similarity index 100%
rename from roles/docker-elk/templates/logstash.conf.j2
rename to roles/server_docker-elk/templates/logstash.conf.j2
diff --git a/roles/docker-elk/templates/logstash.yml.j2 b/roles/server_docker-elk/templates/logstash.yml.j2
similarity index 100%
rename from roles/docker-elk/templates/logstash.yml.j2
rename to roles/server_docker-elk/templates/logstash.yml.j2
diff --git a/roles/docker-funkwhale/README.md b/roles/server_docker-funkwhale/README.md
similarity index 100%
rename from roles/docker-funkwhale/README.md
rename to roles/server_docker-funkwhale/README.md
diff --git a/roles/docker-funkwhale/handlers/main.yml b/roles/server_docker-funkwhale/handlers/main.yml
similarity index 100%
rename from roles/docker-funkwhale/handlers/main.yml
rename to roles/server_docker-funkwhale/handlers/main.yml
diff --git a/roles/docker-funkwhale/meta/main.yml b/roles/server_docker-funkwhale/meta/main.yml
similarity index 100%
rename from roles/docker-funkwhale/meta/main.yml
rename to roles/server_docker-funkwhale/meta/main.yml
diff --git a/roles/docker-funkwhale/tasks/main.yml b/roles/server_docker-funkwhale/tasks/main.yml
similarity index 100%
rename from roles/docker-funkwhale/tasks/main.yml
rename to roles/server_docker-funkwhale/tasks/main.yml
diff --git a/roles/docker-funkwhale/templates/docker-compose.yml.j2 b/roles/server_docker-funkwhale/templates/docker-compose.yml.j2
similarity index 100%
rename from roles/docker-funkwhale/templates/docker-compose.yml.j2
rename to roles/server_docker-funkwhale/templates/docker-compose.yml.j2
diff --git a/roles/docker-funkwhale/templates/env.j2 b/roles/server_docker-funkwhale/templates/env.j2
similarity index 100%
rename from roles/docker-funkwhale/templates/env.j2
rename to roles/server_docker-funkwhale/templates/env.j2
diff --git a/roles/docker-funkwhale/vars/main.yml b/roles/server_docker-funkwhale/vars/main.yml
similarity index 100%
rename from roles/docker-funkwhale/vars/main.yml
rename to roles/server_docker-funkwhale/vars/main.yml
diff --git a/roles/docker-gitea/README.md b/roles/server_docker-gitea/README.md
similarity index 100%
rename from roles/docker-gitea/README.md
rename to roles/server_docker-gitea/README.md
diff --git a/roles/docker-gitea/handlers/main.yml b/roles/server_docker-gitea/handlers/main.yml
similarity index 100%
rename from roles/docker-gitea/handlers/main.yml
rename to roles/server_docker-gitea/handlers/main.yml
diff --git a/roles/docker-gitea/meta/main.yml b/roles/server_docker-gitea/meta/main.yml
similarity index 100%
rename from roles/docker-gitea/meta/main.yml
rename to roles/server_docker-gitea/meta/main.yml
diff --git a/roles/docker-gitea/tasks/main.yml b/roles/server_docker-gitea/tasks/main.yml
similarity index 100%
rename from roles/docker-gitea/tasks/main.yml
rename to roles/server_docker-gitea/tasks/main.yml
diff --git a/roles/docker-gitea/templates/docker-compose.yml.j2 b/roles/server_docker-gitea/templates/docker-compose.yml.j2
similarity index 100%
rename from roles/docker-gitea/templates/docker-compose.yml.j2
rename to roles/server_docker-gitea/templates/docker-compose.yml.j2
diff --git a/roles/docker-jenkins/meta/main.yml b/roles/server_docker-jenkins/meta/main.yml
similarity index 100%
rename from roles/docker-jenkins/meta/main.yml
rename to roles/server_docker-jenkins/meta/main.yml
diff --git a/roles/docker-jenkins/tasks/main.yml b/roles/server_docker-jenkins/tasks/main.yml
similarity index 100%
rename from roles/docker-jenkins/tasks/main.yml
rename to roles/server_docker-jenkins/tasks/main.yml
diff --git a/roles/docker-joomla/README.md b/roles/server_docker-joomla/README.md
similarity index 100%
rename from roles/docker-joomla/README.md
rename to roles/server_docker-joomla/README.md
diff --git a/roles/docker-joomla/meta/main.yml b/roles/server_docker-joomla/meta/main.yml
similarity index 100%
rename from roles/docker-joomla/meta/main.yml
rename to roles/server_docker-joomla/meta/main.yml
diff --git a/roles/docker-joomla/tasks/main.yml b/roles/server_docker-joomla/tasks/main.yml
similarity index 100%
rename from roles/docker-joomla/tasks/main.yml
rename to roles/server_docker-joomla/tasks/main.yml
diff --git a/roles/docker-mailu/README.md b/roles/server_docker-mailu/README.md
similarity index 100%
rename from roles/docker-mailu/README.md
rename to roles/server_docker-mailu/README.md
diff --git a/roles/docker-mailu/handlers/main.yml b/roles/server_docker-mailu/handlers/main.yml
similarity index 100%
rename from roles/docker-mailu/handlers/main.yml
rename to roles/server_docker-mailu/handlers/main.yml
diff --git a/roles/docker-mailu/meta/main.yml b/roles/server_docker-mailu/meta/main.yml
similarity index 100%
rename from roles/docker-mailu/meta/main.yml
rename to roles/server_docker-mailu/meta/main.yml
diff --git a/roles/docker-mailu/tasks/main.yml b/roles/server_docker-mailu/tasks/main.yml
similarity index 100%
rename from roles/docker-mailu/tasks/main.yml
rename to roles/server_docker-mailu/tasks/main.yml
diff --git a/roles/docker-mailu/templates/deploy-letsencrypt-mailu.service.j2 b/roles/server_docker-mailu/templates/deploy-letsencrypt-mailu.service.j2
similarity index 100%
rename from roles/docker-mailu/templates/deploy-letsencrypt-mailu.service.j2
rename to roles/server_docker-mailu/templates/deploy-letsencrypt-mailu.service.j2
diff --git a/roles/docker-mailu/templates/deploy-letsencrypt-mailu.sh.j2 b/roles/server_docker-mailu/templates/deploy-letsencrypt-mailu.sh.j2
similarity index 100%
rename from roles/docker-mailu/templates/deploy-letsencrypt-mailu.sh.j2
rename to roles/server_docker-mailu/templates/deploy-letsencrypt-mailu.sh.j2
diff --git a/roles/docker-mailu/templates/deploy-letsencrypt-mailu.timer.j2 b/roles/server_docker-mailu/templates/deploy-letsencrypt-mailu.timer.j2
similarity index 100%
rename from roles/docker-mailu/templates/deploy-letsencrypt-mailu.timer.j2
rename to roles/server_docker-mailu/templates/deploy-letsencrypt-mailu.timer.j2
diff --git a/roles/docker-mailu/templates/docker-compose.yml.j2 b/roles/server_docker-mailu/templates/docker-compose.yml.j2
similarity index 100%
rename from roles/docker-mailu/templates/docker-compose.yml.j2
rename to roles/server_docker-mailu/templates/docker-compose.yml.j2
diff --git a/roles/docker-mailu/templates/mailu.env.j2 b/roles/server_docker-mailu/templates/mailu.env.j2
similarity index 100%
rename from roles/docker-mailu/templates/mailu.env.j2
rename to roles/server_docker-mailu/templates/mailu.env.j2
diff --git a/roles/docker-mailu/vars/main.yml b/roles/server_docker-mailu/vars/main.yml
similarity index 100%
rename from roles/docker-mailu/vars/main.yml
rename to roles/server_docker-mailu/vars/main.yml
diff --git a/roles/docker-mastodon/README.md b/roles/server_docker-mastodon/README.md
similarity index 100%
rename from roles/docker-mastodon/README.md
rename to roles/server_docker-mastodon/README.md
diff --git a/roles/docker-mastodon/handlers/main.yml b/roles/server_docker-mastodon/handlers/main.yml
similarity index 100%
rename from roles/docker-mastodon/handlers/main.yml
rename to roles/server_docker-mastodon/handlers/main.yml
diff --git a/roles/docker-mastodon/meta/main.yml b/roles/server_docker-mastodon/meta/main.yml
similarity index 100%
rename from roles/docker-mastodon/meta/main.yml
rename to roles/server_docker-mastodon/meta/main.yml
diff --git a/roles/docker-mastodon/tasks/main.yml b/roles/server_docker-mastodon/tasks/main.yml
similarity index 100%
rename from roles/docker-mastodon/tasks/main.yml
rename to roles/server_docker-mastodon/tasks/main.yml
diff --git a/roles/docker-mastodon/templates/.env.production.j2 b/roles/server_docker-mastodon/templates/.env.production.j2
similarity index 100%
rename from roles/docker-mastodon/templates/.env.production.j2
rename to roles/server_docker-mastodon/templates/.env.production.j2
diff --git a/roles/docker-mastodon/templates/docker-compose.yml.j2 b/roles/server_docker-mastodon/templates/docker-compose.yml.j2
similarity index 100%
rename from roles/docker-mastodon/templates/docker-compose.yml.j2
rename to roles/server_docker-mastodon/templates/docker-compose.yml.j2
diff --git a/roles/docker-mastodon/templates/mastodon.conf.j2 b/roles/server_docker-mastodon/templates/mastodon.conf.j2
similarity index 100%
rename from roles/docker-mastodon/templates/mastodon.conf.j2
rename to roles/server_docker-mastodon/templates/mastodon.conf.j2
diff --git a/roles/docker-mastodon/vars/main.yml b/roles/server_docker-mastodon/vars/main.yml
similarity index 100%
rename from roles/docker-mastodon/vars/main.yml
rename to roles/server_docker-mastodon/vars/main.yml
diff --git a/roles/docker-mediawiki/README.md b/roles/server_docker-mediawiki/README.md
similarity index 100%
rename from roles/docker-mediawiki/README.md
rename to roles/server_docker-mediawiki/README.md
diff --git a/roles/docker-mediawiki/meta/main.yml b/roles/server_docker-mediawiki/meta/main.yml
similarity index 100%
rename from roles/docker-mediawiki/meta/main.yml
rename to roles/server_docker-mediawiki/meta/main.yml
diff --git a/roles/docker-mediawiki/tasks/main.yml b/roles/server_docker-mediawiki/tasks/main.yml
similarity index 100%
rename from roles/docker-mediawiki/tasks/main.yml
rename to roles/server_docker-mediawiki/tasks/main.yml
diff --git a/roles/docker-mybb/README.md b/roles/server_docker-mybb/README.md
similarity index 100%
rename from roles/docker-mybb/README.md
rename to roles/server_docker-mybb/README.md
diff --git a/roles/docker-mybb/defaults/main.yml b/roles/server_docker-mybb/defaults/main.yml
similarity index 100%
rename from roles/docker-mybb/defaults/main.yml
rename to roles/server_docker-mybb/defaults/main.yml
diff --git a/roles/docker-mybb/meta/main.yml b/roles/server_docker-mybb/meta/main.yml
similarity index 100%
rename from roles/docker-mybb/meta/main.yml
rename to roles/server_docker-mybb/meta/main.yml
diff --git a/roles/docker-mybb/tasks/main.yml b/roles/server_docker-mybb/tasks/main.yml
similarity index 100%
rename from roles/docker-mybb/tasks/main.yml
rename to roles/server_docker-mybb/tasks/main.yml
diff --git a/roles/docker-mybb/templates/default.conf b/roles/server_docker-mybb/templates/default.conf
similarity index 100%
rename from roles/docker-mybb/templates/default.conf
rename to roles/server_docker-mybb/templates/default.conf
diff --git a/roles/docker-nextcloud/README.md b/roles/server_docker-nextcloud/README.md
similarity index 100%
rename from roles/docker-nextcloud/README.md
rename to roles/server_docker-nextcloud/README.md
diff --git a/roles/docker-nextcloud/handlers/main.yml b/roles/server_docker-nextcloud/handlers/main.yml
similarity index 100%
rename from roles/docker-nextcloud/handlers/main.yml
rename to roles/server_docker-nextcloud/handlers/main.yml
diff --git a/roles/docker-nextcloud/meta/main.yml b/roles/server_docker-nextcloud/meta/main.yml
similarity index 100%
rename from roles/docker-nextcloud/meta/main.yml
rename to roles/server_docker-nextcloud/meta/main.yml
diff --git a/roles/docker-nextcloud/tasks/main.yml b/roles/server_docker-nextcloud/tasks/main.yml
similarity index 100%
rename from roles/docker-nextcloud/tasks/main.yml
rename to roles/server_docker-nextcloud/tasks/main.yml
diff --git a/roles/docker-nextcloud/templates/docker-compose.yml.j2 b/roles/server_docker-nextcloud/templates/docker-compose.yml.j2
similarity index 100%
rename from roles/docker-nextcloud/templates/docker-compose.yml.j2
rename to roles/server_docker-nextcloud/templates/docker-compose.yml.j2
diff --git a/roles/docker-nextcloud/templates/nextcloud.conf.j2 b/roles/server_docker-nextcloud/templates/nextcloud.conf.j2
similarity index 100%
rename from roles/docker-nextcloud/templates/nextcloud.conf.j2
rename to roles/server_docker-nextcloud/templates/nextcloud.conf.j2
diff --git a/roles/docker-nextcloud/templates/nginx.conf.j2 b/roles/server_docker-nextcloud/templates/nginx.conf.j2
similarity index 100%
rename from roles/docker-nextcloud/templates/nginx.conf.j2
rename to roles/server_docker-nextcloud/templates/nginx.conf.j2
diff --git a/roles/docker-peertube/README.md b/roles/server_docker-peertube/README.md
similarity index 100%
rename from roles/docker-peertube/README.md
rename to roles/server_docker-peertube/README.md
diff --git a/roles/docker-peertube/handlers/main.yml b/roles/server_docker-peertube/handlers/main.yml
similarity index 100%
rename from roles/docker-peertube/handlers/main.yml
rename to roles/server_docker-peertube/handlers/main.yml
diff --git a/roles/docker-peertube/meta/main.yml b/roles/server_docker-peertube/meta/main.yml
similarity index 100%
rename from roles/docker-peertube/meta/main.yml
rename to roles/server_docker-peertube/meta/main.yml
diff --git a/roles/docker-peertube/tasks/main.yml b/roles/server_docker-peertube/tasks/main.yml
similarity index 100%
rename from roles/docker-peertube/tasks/main.yml
rename to roles/server_docker-peertube/tasks/main.yml
diff --git a/roles/docker-peertube/templates/docker-compose.yml.j2 b/roles/server_docker-peertube/templates/docker-compose.yml.j2
similarity index 100%
rename from roles/docker-peertube/templates/docker-compose.yml.j2
rename to roles/server_docker-peertube/templates/docker-compose.yml.j2
diff --git a/roles/docker-peertube/templates/env.j2 b/roles/server_docker-peertube/templates/env.j2
similarity index 100%
rename from roles/docker-peertube/templates/env.j2
rename to roles/server_docker-peertube/templates/env.j2
diff --git a/roles/docker-peertube/templates/peertube.conf.j2 b/roles/server_docker-peertube/templates/peertube.conf.j2
similarity index 100%
rename from roles/docker-peertube/templates/peertube.conf.j2
rename to roles/server_docker-peertube/templates/peertube.conf.j2
diff --git a/roles/docker-peertube/vars/main.yml b/roles/server_docker-peertube/vars/main.yml
similarity index 100%
rename from roles/docker-peertube/vars/main.yml
rename to roles/server_docker-peertube/vars/main.yml
diff --git a/roles/docker-pixelfed/README.md b/roles/server_docker-pixelfed/README.md
similarity index 100%
rename from roles/docker-pixelfed/README.md
rename to roles/server_docker-pixelfed/README.md
diff --git a/roles/docker-pixelfed/handlers/main.yml b/roles/server_docker-pixelfed/handlers/main.yml
similarity index 100%
rename from roles/docker-pixelfed/handlers/main.yml
rename to roles/server_docker-pixelfed/handlers/main.yml
diff --git a/roles/docker-pixelfed/meta/main.yml b/roles/server_docker-pixelfed/meta/main.yml
similarity index 100%
rename from roles/docker-pixelfed/meta/main.yml
rename to roles/server_docker-pixelfed/meta/main.yml
diff --git a/roles/docker-pixelfed/tasks/main.yml b/roles/server_docker-pixelfed/tasks/main.yml
similarity index 100%
rename from roles/docker-pixelfed/tasks/main.yml
rename to roles/server_docker-pixelfed/tasks/main.yml
diff --git a/roles/docker-pixelfed/templates/docker-compose.yml.j2 b/roles/server_docker-pixelfed/templates/docker-compose.yml.j2
similarity index 100%
rename from roles/docker-pixelfed/templates/docker-compose.yml.j2
rename to roles/server_docker-pixelfed/templates/docker-compose.yml.j2
diff --git a/roles/docker-pixelfed/templates/env.j2 b/roles/server_docker-pixelfed/templates/env.j2
similarity index 100%
rename from roles/docker-pixelfed/templates/env.j2
rename to roles/server_docker-pixelfed/templates/env.j2
diff --git a/roles/docker-pixelfed/vars/main.yml b/roles/server_docker-pixelfed/vars/main.yml
similarity index 100%
rename from roles/docker-pixelfed/vars/main.yml
rename to roles/server_docker-pixelfed/vars/main.yml
diff --git a/roles/docker-roulette-wheel/handlers/main.yml b/roles/server_docker-roulette-wheel/handlers/main.yml
similarity index 100%
rename from roles/docker-roulette-wheel/handlers/main.yml
rename to roles/server_docker-roulette-wheel/handlers/main.yml
diff --git a/roles/docker-roulette-wheel/meta/main.yml b/roles/server_docker-roulette-wheel/meta/main.yml
similarity index 100%
rename from roles/docker-roulette-wheel/meta/main.yml
rename to roles/server_docker-roulette-wheel/meta/main.yml
diff --git a/roles/docker-roulette-wheel/readme.md b/roles/server_docker-roulette-wheel/readme.md
similarity index 100%
rename from roles/docker-roulette-wheel/readme.md
rename to roles/server_docker-roulette-wheel/readme.md
diff --git a/roles/docker-roulette-wheel/tasks/main.yml b/roles/server_docker-roulette-wheel/tasks/main.yml
similarity index 100%
rename from roles/docker-roulette-wheel/tasks/main.yml
rename to roles/server_docker-roulette-wheel/tasks/main.yml
diff --git a/roles/docker-roulette-wheel/templates/Dockerfile.j2 b/roles/server_docker-roulette-wheel/templates/Dockerfile.j2
similarity index 100%
rename from roles/docker-roulette-wheel/templates/Dockerfile.j2
rename to roles/server_docker-roulette-wheel/templates/Dockerfile.j2
diff --git a/roles/docker-roulette-wheel/templates/docker-compose.yml.j2 b/roles/server_docker-roulette-wheel/templates/docker-compose.yml.j2
similarity index 100%
rename from roles/docker-roulette-wheel/templates/docker-compose.yml.j2
rename to roles/server_docker-roulette-wheel/templates/docker-compose.yml.j2
diff --git a/roles/docker-roulette-wheel/vars/main.yml b/roles/server_docker-roulette-wheel/vars/main.yml
similarity index 100%
rename from roles/docker-roulette-wheel/vars/main.yml
rename to roles/server_docker-roulette-wheel/vars/main.yml
diff --git a/roles/docker-turn-server/handlers/main.yml b/roles/server_docker-turn-server/handlers/main.yml
similarity index 100%
rename from roles/docker-turn-server/handlers/main.yml
rename to roles/server_docker-turn-server/handlers/main.yml
diff --git a/roles/docker-turn-server/readme.md b/roles/server_docker-turn-server/readme.md
similarity index 100%
rename from roles/docker-turn-server/readme.md
rename to roles/server_docker-turn-server/readme.md
diff --git a/roles/docker-turn-server/tasks/main.yml b/roles/server_docker-turn-server/tasks/main.yml
similarity index 100%
rename from roles/docker-turn-server/tasks/main.yml
rename to roles/server_docker-turn-server/tasks/main.yml
diff --git a/roles/docker-turn-server/templates/turnserver.conf.j2 b/roles/server_docker-turn-server/templates/turnserver.conf.j2
similarity index 100%
rename from roles/docker-turn-server/templates/turnserver.conf.j2
rename to roles/server_docker-turn-server/templates/turnserver.conf.j2
diff --git a/roles/docker-turn-server/vars/main.yml b/roles/server_docker-turn-server/vars/main.yml
similarity index 100%
rename from roles/docker-turn-server/vars/main.yml
rename to roles/server_docker-turn-server/vars/main.yml
diff --git a/roles/docker-wordpress/README.md b/roles/server_docker-wordpress/README.md
similarity index 100%
rename from roles/docker-wordpress/README.md
rename to roles/server_docker-wordpress/README.md
diff --git a/roles/docker-wordpress/handlers/main.yml b/roles/server_docker-wordpress/handlers/main.yml
similarity index 100%
rename from roles/docker-wordpress/handlers/main.yml
rename to roles/server_docker-wordpress/handlers/main.yml
diff --git a/roles/docker-wordpress/meta/main.yml b/roles/server_docker-wordpress/meta/main.yml
similarity index 100%
rename from roles/docker-wordpress/meta/main.yml
rename to roles/server_docker-wordpress/meta/main.yml
diff --git a/roles/docker-wordpress/tasks/main.yml b/roles/server_docker-wordpress/tasks/main.yml
similarity index 100%
rename from roles/docker-wordpress/tasks/main.yml
rename to roles/server_docker-wordpress/tasks/main.yml
diff --git a/roles/docker-wordpress/templates/docker-compose.yml.j2 b/roles/server_docker-wordpress/templates/docker-compose.yml.j2
similarity index 100%
rename from roles/docker-wordpress/templates/docker-compose.yml.j2
rename to roles/server_docker-wordpress/templates/docker-compose.yml.j2
diff --git a/roles/docker-yourls/README.md b/roles/server_docker-yourls/README.md
similarity index 100%
rename from roles/docker-yourls/README.md
rename to roles/server_docker-yourls/README.md
diff --git a/roles/docker-yourls/handlers/main.yml b/roles/server_docker-yourls/handlers/main.yml
similarity index 100%
rename from roles/docker-yourls/handlers/main.yml
rename to roles/server_docker-yourls/handlers/main.yml
diff --git a/roles/docker-yourls/meta/main.yml b/roles/server_docker-yourls/meta/main.yml
similarity index 100%
rename from roles/docker-yourls/meta/main.yml
rename to roles/server_docker-yourls/meta/main.yml
diff --git a/roles/docker-yourls/tasks/main.yml b/roles/server_docker-yourls/tasks/main.yml
similarity index 100%
rename from roles/docker-yourls/tasks/main.yml
rename to roles/server_docker-yourls/tasks/main.yml
diff --git a/roles/docker-yourls/templates/docker-compose.yml.j2 b/roles/server_docker-yourls/templates/docker-compose.yml.j2
similarity index 100%
rename from roles/docker-yourls/templates/docker-compose.yml.j2
rename to roles/server_docker-yourls/templates/docker-compose.yml.j2
diff --git a/roles/native-apt-update/README.md b/roles/server_native-apt-update/README.md
similarity index 100%
rename from roles/native-apt-update/README.md
rename to roles/server_native-apt-update/README.md
diff --git a/roles/native-apt-update/tasks/main.yml b/roles/server_native-apt-update/tasks/main.yml
similarity index 100%
rename from roles/native-apt-update/tasks/main.yml
rename to roles/server_native-apt-update/tasks/main.yml
diff --git a/roles/native-backups-cleanup/README.md b/roles/server_native-backups-cleanup/README.md
similarity index 100%
rename from roles/native-backups-cleanup/README.md
rename to roles/server_native-backups-cleanup/README.md
diff --git a/roles/native-backups-cleanup/files/backups-cleanup.py b/roles/server_native-backups-cleanup/files/backups-cleanup.py
similarity index 100%
rename from roles/native-backups-cleanup/files/backups-cleanup.py
rename to roles/server_native-backups-cleanup/files/backups-cleanup.py
diff --git a/roles/native-backups-cleanup/handlers/main.yml b/roles/server_native-backups-cleanup/handlers/main.yml
similarity index 100%
rename from roles/native-backups-cleanup/handlers/main.yml
rename to roles/server_native-backups-cleanup/handlers/main.yml
diff --git a/roles/native-backups-cleanup/meta/main.yml b/roles/server_native-backups-cleanup/meta/main.yml
similarity index 100%
rename from roles/native-backups-cleanup/meta/main.yml
rename to roles/server_native-backups-cleanup/meta/main.yml
diff --git a/roles/native-backups-cleanup/tasks/main.yml b/roles/server_native-backups-cleanup/tasks/main.yml
similarity index 100%
rename from roles/native-backups-cleanup/tasks/main.yml
rename to roles/server_native-backups-cleanup/tasks/main.yml
diff --git a/roles/native-backups-cleanup/templates/backups-cleanup.service.j2 b/roles/server_native-backups-cleanup/templates/backups-cleanup.service.j2
similarity index 100%
rename from roles/native-backups-cleanup/templates/backups-cleanup.service.j2
rename to roles/server_native-backups-cleanup/templates/backups-cleanup.service.j2
diff --git a/roles/native-backups-cleanup/templates/backups-cleanup.timer.j2 b/roles/server_native-backups-cleanup/templates/backups-cleanup.timer.j2
similarity index 100%
rename from roles/native-backups-cleanup/templates/backups-cleanup.timer.j2
rename to roles/server_native-backups-cleanup/templates/backups-cleanup.timer.j2
diff --git a/roles/native-backups-cleanup/vars/main.yml b/roles/server_native-backups-cleanup/vars/main.yml
similarity index 100%
rename from roles/native-backups-cleanup/vars/main.yml
rename to roles/server_native-backups-cleanup/vars/main.yml
diff --git a/roles/native-btrfs-health-check/README.md b/roles/server_native-btrfs-health-check/README.md
similarity index 100%
rename from roles/native-btrfs-health-check/README.md
rename to roles/server_native-btrfs-health-check/README.md
diff --git a/roles/native-btrfs-health-check/files/btrfs-health-check.sh b/roles/server_native-btrfs-health-check/files/btrfs-health-check.sh
similarity index 100%
rename from roles/native-btrfs-health-check/files/btrfs-health-check.sh
rename to roles/server_native-btrfs-health-check/files/btrfs-health-check.sh
diff --git a/roles/native-btrfs-health-check/handlers/main.yml b/roles/server_native-btrfs-health-check/handlers/main.yml
similarity index 100%
rename from roles/native-btrfs-health-check/handlers/main.yml
rename to roles/server_native-btrfs-health-check/handlers/main.yml
diff --git a/roles/native-btrfs-health-check/meta/main.yml b/roles/server_native-btrfs-health-check/meta/main.yml
similarity index 100%
rename from roles/native-btrfs-health-check/meta/main.yml
rename to roles/server_native-btrfs-health-check/meta/main.yml
diff --git a/roles/native-btrfs-health-check/tasks/main.yml b/roles/server_native-btrfs-health-check/tasks/main.yml
similarity index 100%
rename from roles/native-btrfs-health-check/tasks/main.yml
rename to roles/server_native-btrfs-health-check/tasks/main.yml
diff --git a/roles/native-btrfs-health-check/templates/btrfs-health-check.service.j2 b/roles/server_native-btrfs-health-check/templates/btrfs-health-check.service.j2
similarity index 100%
rename from roles/native-btrfs-health-check/templates/btrfs-health-check.service.j2
rename to roles/server_native-btrfs-health-check/templates/btrfs-health-check.service.j2
diff --git a/roles/native-btrfs-health-check/templates/btrfs-health-check.timer.j2 b/roles/server_native-btrfs-health-check/templates/btrfs-health-check.timer.j2
similarity index 100%
rename from roles/native-btrfs-health-check/templates/btrfs-health-check.timer.j2
rename to roles/server_native-btrfs-health-check/templates/btrfs-health-check.timer.j2
diff --git a/roles/native-btrfs-health-check/vars/main.yml b/roles/server_native-btrfs-health-check/vars/main.yml
similarity index 100%
rename from roles/native-btrfs-health-check/vars/main.yml
rename to roles/server_native-btrfs-health-check/vars/main.yml
diff --git a/roles/native-certbot-nginx/handlers/main.yml b/roles/server_native-certbot-nginx/handlers/main.yml
similarity index 100%
rename from roles/native-certbot-nginx/handlers/main.yml
rename to roles/server_native-certbot-nginx/handlers/main.yml
diff --git a/roles/native-certbot-nginx/meta/main.yml b/roles/server_native-certbot-nginx/meta/main.yml
similarity index 100%
rename from roles/native-certbot-nginx/meta/main.yml
rename to roles/server_native-certbot-nginx/meta/main.yml
diff --git a/roles/native-certbot-nginx/tasks/main.yml b/roles/server_native-certbot-nginx/tasks/main.yml
similarity index 100%
rename from roles/native-certbot-nginx/tasks/main.yml
rename to roles/server_native-certbot-nginx/tasks/main.yml
diff --git a/roles/native-certbot-nginx/templates/certbot.service.j2 b/roles/server_native-certbot-nginx/templates/certbot.service.j2
similarity index 100%
rename from roles/native-certbot-nginx/templates/certbot.service.j2
rename to roles/server_native-certbot-nginx/templates/certbot.service.j2
diff --git a/roles/native-certbot-nginx/templates/certbot.timer.j2 b/roles/server_native-certbot-nginx/templates/certbot.timer.j2
similarity index 100%
rename from roles/native-certbot-nginx/templates/certbot.timer.j2
rename to roles/server_native-certbot-nginx/templates/certbot.timer.j2
diff --git a/roles/native-disc-space-check/README.md b/roles/server_native-disc-space-check/README.md
similarity index 100%
rename from roles/native-disc-space-check/README.md
rename to roles/server_native-disc-space-check/README.md
diff --git a/roles/native-disc-space-check/files/disc-space-check.sh b/roles/server_native-disc-space-check/files/disc-space-check.sh
similarity index 100%
rename from roles/native-disc-space-check/files/disc-space-check.sh
rename to roles/server_native-disc-space-check/files/disc-space-check.sh
diff --git a/roles/native-disc-space-check/handlers/main.yml b/roles/server_native-disc-space-check/handlers/main.yml
similarity index 100%
rename from roles/native-disc-space-check/handlers/main.yml
rename to roles/server_native-disc-space-check/handlers/main.yml
diff --git a/roles/native-disc-space-check/meta/main.yml b/roles/server_native-disc-space-check/meta/main.yml
similarity index 100%
rename from roles/native-disc-space-check/meta/main.yml
rename to roles/server_native-disc-space-check/meta/main.yml
diff --git a/roles/native-disc-space-check/tasks/main.yml b/roles/server_native-disc-space-check/tasks/main.yml
similarity index 100%
rename from roles/native-disc-space-check/tasks/main.yml
rename to roles/server_native-disc-space-check/tasks/main.yml
diff --git a/roles/native-disc-space-check/templates/disc-space-check.service.j2 b/roles/server_native-disc-space-check/templates/disc-space-check.service.j2
similarity index 100%
rename from roles/native-disc-space-check/templates/disc-space-check.service.j2
rename to roles/server_native-disc-space-check/templates/disc-space-check.service.j2
diff --git a/roles/native-disc-space-check/templates/disc-space-check.timer.j2 b/roles/server_native-disc-space-check/templates/disc-space-check.timer.j2
similarity index 100%
rename from roles/native-disc-space-check/templates/disc-space-check.timer.j2
rename to roles/server_native-disc-space-check/templates/disc-space-check.timer.j2
diff --git a/roles/native-disc-space-check/vars/main.yml b/roles/server_native-disc-space-check/vars/main.yml
similarity index 100%
rename from roles/native-disc-space-check/vars/main.yml
rename to roles/server_native-disc-space-check/vars/main.yml
diff --git a/roles/native-docker-compose-restart-unhealthy/README.md b/roles/server_native-docker-compose-restart-unhealthy/README.md
similarity index 100%
rename from roles/native-docker-compose-restart-unhealthy/README.md
rename to roles/server_native-docker-compose-restart-unhealthy/README.md
diff --git a/roles/native-docker-compose-restart-unhealthy/files/docker-compose-restart-unhealthy.py b/roles/server_native-docker-compose-restart-unhealthy/files/docker-compose-restart-unhealthy.py
similarity index 100%
rename from roles/native-docker-compose-restart-unhealthy/files/docker-compose-restart-unhealthy.py
rename to roles/server_native-docker-compose-restart-unhealthy/files/docker-compose-restart-unhealthy.py
diff --git a/roles/native-docker-compose-restart-unhealthy/handlers/main.yml b/roles/server_native-docker-compose-restart-unhealthy/handlers/main.yml
similarity index 100%
rename from roles/native-docker-compose-restart-unhealthy/handlers/main.yml
rename to roles/server_native-docker-compose-restart-unhealthy/handlers/main.yml
diff --git a/roles/native-docker-compose-restart-unhealthy/tasks/main.yml b/roles/server_native-docker-compose-restart-unhealthy/tasks/main.yml
similarity index 100%
rename from roles/native-docker-compose-restart-unhealthy/tasks/main.yml
rename to roles/server_native-docker-compose-restart-unhealthy/tasks/main.yml
diff --git a/roles/native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.service.j2 b/roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.service.j2
similarity index 100%
rename from roles/native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.service.j2
rename to roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.service.j2
diff --git a/roles/native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.timer.j2 b/roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.timer.j2
similarity index 100%
rename from roles/native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.timer.j2
rename to roles/server_native-docker-compose-restart-unhealthy/templates/docker-compose-restart-unhealthy.timer.j2
diff --git a/roles/native-docker-compose-restart-unhealthy/vars/main.yml b/roles/server_native-docker-compose-restart-unhealthy/vars/main.yml
similarity index 100%
rename from roles/native-docker-compose-restart-unhealthy/vars/main.yml
rename to roles/server_native-docker-compose-restart-unhealthy/vars/main.yml
diff --git a/roles/native-docker-health-check/files/docker-health-check.sh b/roles/server_native-docker-health-check/files/docker-health-check.sh
similarity index 100%
rename from roles/native-docker-health-check/files/docker-health-check.sh
rename to roles/server_native-docker-health-check/files/docker-health-check.sh
diff --git a/roles/native-docker-health-check/handlers/main.yml b/roles/server_native-docker-health-check/handlers/main.yml
similarity index 100%
rename from roles/native-docker-health-check/handlers/main.yml
rename to roles/server_native-docker-health-check/handlers/main.yml
diff --git a/roles/native-docker-health-check/meta/main.yml b/roles/server_native-docker-health-check/meta/main.yml
similarity index 100%
rename from roles/native-docker-health-check/meta/main.yml
rename to roles/server_native-docker-health-check/meta/main.yml
diff --git a/roles/native-docker-health-check/tasks/main.yml b/roles/server_native-docker-health-check/tasks/main.yml
similarity index 100%
rename from roles/native-docker-health-check/tasks/main.yml
rename to roles/server_native-docker-health-check/tasks/main.yml
diff --git a/roles/native-docker-health-check/templates/docker-health-check.service.j2 b/roles/server_native-docker-health-check/templates/docker-health-check.service.j2
similarity index 100%
rename from roles/native-docker-health-check/templates/docker-health-check.service.j2
rename to roles/server_native-docker-health-check/templates/docker-health-check.service.j2
diff --git a/roles/native-docker-health-check/templates/docker-health-check.timer.j2 b/roles/server_native-docker-health-check/templates/docker-health-check.timer.j2
similarity index 100%
rename from roles/native-docker-health-check/templates/docker-health-check.timer.j2
rename to roles/server_native-docker-health-check/templates/docker-health-check.timer.j2
diff --git a/roles/native-docker-health-check/vars/main.yml b/roles/server_native-docker-health-check/vars/main.yml
similarity index 100%
rename from roles/native-docker-health-check/vars/main.yml
rename to roles/server_native-docker-health-check/vars/main.yml
diff --git a/roles/native-docker-reverse-proxy/README.md b/roles/server_native-docker-reverse-proxy/README.md
similarity index 100%
rename from roles/native-docker-reverse-proxy/README.md
rename to roles/server_native-docker-reverse-proxy/README.md
diff --git a/roles/native-docker-reverse-proxy/meta/main.yml b/roles/server_native-docker-reverse-proxy/meta/main.yml
similarity index 100%
rename from roles/native-docker-reverse-proxy/meta/main.yml
rename to roles/server_native-docker-reverse-proxy/meta/main.yml
diff --git a/roles/native-docker-reverse-proxy/templates/domain.conf.j2 b/roles/server_native-docker-reverse-proxy/templates/domain.conf.j2
similarity index 100%
rename from roles/native-docker-reverse-proxy/templates/domain.conf.j2
rename to roles/server_native-docker-reverse-proxy/templates/domain.conf.j2
diff --git a/roles/native-docker-reverse-proxy/templates/proxy_pass.conf.j2 b/roles/server_native-docker-reverse-proxy/templates/proxy_pass.conf.j2
similarity index 100%
rename from roles/native-docker-reverse-proxy/templates/proxy_pass.conf.j2
rename to roles/server_native-docker-reverse-proxy/templates/proxy_pass.conf.j2
diff --git a/roles/native-docker-volume-backup/handlers/main.yml b/roles/server_native-docker-volume-backup/handlers/main.yml
similarity index 100%
rename from roles/native-docker-volume-backup/handlers/main.yml
rename to roles/server_native-docker-volume-backup/handlers/main.yml
diff --git a/roles/native-docker-volume-backup/meta/main.yml b/roles/server_native-docker-volume-backup/meta/main.yml
similarity index 100%
rename from roles/native-docker-volume-backup/meta/main.yml
rename to roles/server_native-docker-volume-backup/meta/main.yml
diff --git a/roles/native-docker-volume-backup/tasks/main.yml b/roles/server_native-docker-volume-backup/tasks/main.yml
similarity index 100%
rename from roles/native-docker-volume-backup/tasks/main.yml
rename to roles/server_native-docker-volume-backup/tasks/main.yml
diff --git a/roles/native-docker-volume-backup/templates/docker-volume-backup.service.j2 b/roles/server_native-docker-volume-backup/templates/docker-volume-backup.service.j2
similarity index 100%
rename from roles/native-docker-volume-backup/templates/docker-volume-backup.service.j2
rename to roles/server_native-docker-volume-backup/templates/docker-volume-backup.service.j2
diff --git a/roles/native-docker-volume-backup/templates/docker-volume-backup.timer.j2 b/roles/server_native-docker-volume-backup/templates/docker-volume-backup.timer.j2
similarity index 100%
rename from roles/native-docker-volume-backup/templates/docker-volume-backup.timer.j2
rename to roles/server_native-docker-volume-backup/templates/docker-volume-backup.timer.j2
diff --git a/roles/native-docker-volume-backup/vars/main.yml b/roles/server_native-docker-volume-backup/vars/main.yml
similarity index 100%
rename from roles/native-docker-volume-backup/vars/main.yml
rename to roles/server_native-docker-volume-backup/vars/main.yml
diff --git a/roles/native-docker/Readme.md b/roles/server_native-docker/Readme.md
similarity index 100%
rename from roles/native-docker/Readme.md
rename to roles/server_native-docker/Readme.md
diff --git a/roles/native-docker/handlers/main.yml b/roles/server_native-docker/handlers/main.yml
similarity index 100%
rename from roles/native-docker/handlers/main.yml
rename to roles/server_native-docker/handlers/main.yml
diff --git a/roles/native-docker/meta/main.yml b/roles/server_native-docker/meta/main.yml
similarity index 100%
rename from roles/native-docker/meta/main.yml
rename to roles/server_native-docker/meta/main.yml
diff --git a/roles/native-docker/tasks/main.yml b/roles/server_native-docker/tasks/main.yml
similarity index 100%
rename from roles/native-docker/tasks/main.yml
rename to roles/server_native-docker/tasks/main.yml
diff --git a/roles/native-free-disc-space/README.md b/roles/server_native-free-disc-space/README.md
similarity index 100%
rename from roles/native-free-disc-space/README.md
rename to roles/server_native-free-disc-space/README.md
diff --git a/roles/native-free-disc-space/handlers/main.yml b/roles/server_native-free-disc-space/handlers/main.yml
similarity index 100%
rename from roles/native-free-disc-space/handlers/main.yml
rename to roles/server_native-free-disc-space/handlers/main.yml
diff --git a/roles/native-free-disc-space/meta/main.yml b/roles/server_native-free-disc-space/meta/main.yml
similarity index 100%
rename from roles/native-free-disc-space/meta/main.yml
rename to roles/server_native-free-disc-space/meta/main.yml
diff --git a/roles/native-free-disc-space/tasks/main.yml b/roles/server_native-free-disc-space/tasks/main.yml
similarity index 100%
rename from roles/native-free-disc-space/tasks/main.yml
rename to roles/server_native-free-disc-space/tasks/main.yml
diff --git a/roles/native-free-disc-space/templates/free-disc-space.service.j2 b/roles/server_native-free-disc-space/templates/free-disc-space.service.j2
similarity index 100%
rename from roles/native-free-disc-space/templates/free-disc-space.service.j2
rename to roles/server_native-free-disc-space/templates/free-disc-space.service.j2
diff --git a/roles/native-free-disc-space/templates/free-disc-space.sh.j2 b/roles/server_native-free-disc-space/templates/free-disc-space.sh.j2
similarity index 100%
rename from roles/native-free-disc-space/templates/free-disc-space.sh.j2
rename to roles/server_native-free-disc-space/templates/free-disc-space.sh.j2
diff --git a/roles/native-free-disc-space/templates/free-disc-space.timer.j2 b/roles/server_native-free-disc-space/templates/free-disc-space.timer.j2
similarity index 100%
rename from roles/native-free-disc-space/templates/free-disc-space.timer.j2
rename to roles/server_native-free-disc-space/templates/free-disc-space.timer.j2
diff --git a/roles/native-free-disc-space/vars/main.yml b/roles/server_native-free-disc-space/vars/main.yml
similarity index 100%
rename from roles/native-free-disc-space/vars/main.yml
rename to roles/server_native-free-disc-space/vars/main.yml
diff --git a/roles/native-git/tasks/main.yml b/roles/server_native-git/tasks/main.yml
similarity index 100%
rename from roles/native-git/tasks/main.yml
rename to roles/server_native-git/tasks/main.yml
diff --git a/roles/native-homepage/meta/main.yml b/roles/server_native-homepage/meta/main.yml
similarity index 100%
rename from roles/native-homepage/meta/main.yml
rename to roles/server_native-homepage/meta/main.yml
diff --git a/roles/native-homepage/tasks/main.yml b/roles/server_native-homepage/tasks/main.yml
similarity index 100%
rename from roles/native-homepage/tasks/main.yml
rename to roles/server_native-homepage/tasks/main.yml
diff --git a/roles/native-homepage/templates/homepage.nginx.conf.j2 b/roles/server_native-homepage/templates/homepage.nginx.conf.j2
similarity index 100%
rename from roles/native-homepage/templates/homepage.nginx.conf.j2
rename to roles/server_native-homepage/templates/homepage.nginx.conf.j2
diff --git a/roles/native-hostname/tasks/main.yml b/roles/server_native-hostname/tasks/main.yml
similarity index 100%
rename from roles/native-hostname/tasks/main.yml
rename to roles/server_native-hostname/tasks/main.yml
diff --git a/roles/native-https-redirect/meta/main.yml b/roles/server_native-https-redirect/meta/main.yml
similarity index 100%
rename from roles/native-https-redirect/meta/main.yml
rename to roles/server_native-https-redirect/meta/main.yml
diff --git a/roles/native-https-redirect/readme.md b/roles/server_native-https-redirect/readme.md
similarity index 100%
rename from roles/native-https-redirect/readme.md
rename to roles/server_native-https-redirect/readme.md
diff --git a/roles/native-https-redirect/tasks/main.yml b/roles/server_native-https-redirect/tasks/main.yml
similarity index 100%
rename from roles/native-https-redirect/tasks/main.yml
rename to roles/server_native-https-redirect/tasks/main.yml
diff --git a/roles/native-https-redirect/templates/redirect.domain.nginx.conf.j2 b/roles/server_native-https-redirect/templates/redirect.domain.nginx.conf.j2
similarity index 100%
rename from roles/native-https-redirect/templates/redirect.domain.nginx.conf.j2
rename to roles/server_native-https-redirect/templates/redirect.domain.nginx.conf.j2
diff --git a/roles/native-https-server/meta/main.yml b/roles/server_native-https-server/meta/main.yml
similarity index 100%
rename from roles/native-https-server/meta/main.yml
rename to roles/server_native-https-server/meta/main.yml
diff --git a/roles/native-journalctl-health-check/README.md b/roles/server_native-journalctl-health-check/README.md
similarity index 100%
rename from roles/native-journalctl-health-check/README.md
rename to roles/server_native-journalctl-health-check/README.md
diff --git a/roles/native-journalctl-health-check/files/journalctl-health-check.sh b/roles/server_native-journalctl-health-check/files/journalctl-health-check.sh
similarity index 100%
rename from roles/native-journalctl-health-check/files/journalctl-health-check.sh
rename to roles/server_native-journalctl-health-check/files/journalctl-health-check.sh
diff --git a/roles/native-journalctl-health-check/handlers/main.yml b/roles/server_native-journalctl-health-check/handlers/main.yml
similarity index 100%
rename from roles/native-journalctl-health-check/handlers/main.yml
rename to roles/server_native-journalctl-health-check/handlers/main.yml
diff --git a/roles/native-journalctl-health-check/meta/main.yml b/roles/server_native-journalctl-health-check/meta/main.yml
similarity index 100%
rename from roles/native-journalctl-health-check/meta/main.yml
rename to roles/server_native-journalctl-health-check/meta/main.yml
diff --git a/roles/native-journalctl-health-check/tasks/main.yml b/roles/server_native-journalctl-health-check/tasks/main.yml
similarity index 100%
rename from roles/native-journalctl-health-check/tasks/main.yml
rename to roles/server_native-journalctl-health-check/tasks/main.yml
diff --git a/roles/native-journalctl-health-check/templates/journalctl-health-check.service.j2 b/roles/server_native-journalctl-health-check/templates/journalctl-health-check.service.j2
similarity index 100%
rename from roles/native-journalctl-health-check/templates/journalctl-health-check.service.j2
rename to roles/server_native-journalctl-health-check/templates/journalctl-health-check.service.j2
diff --git a/roles/native-journalctl-health-check/templates/journalctl-health-check.timer.j2 b/roles/server_native-journalctl-health-check/templates/journalctl-health-check.timer.j2
similarity index 100%
rename from roles/native-journalctl-health-check/templates/journalctl-health-check.timer.j2
rename to roles/server_native-journalctl-health-check/templates/journalctl-health-check.timer.j2
diff --git a/roles/native-journalctl-health-check/vars/main.yml b/roles/server_native-journalctl-health-check/vars/main.yml
similarity index 100%
rename from roles/native-journalctl-health-check/vars/main.yml
rename to roles/server_native-journalctl-health-check/vars/main.yml
diff --git a/roles/native-journalctl/README.md b/roles/server_native-journalctl/README.md
similarity index 100%
rename from roles/native-journalctl/README.md
rename to roles/server_native-journalctl/README.md
diff --git a/roles/native-journalctl/handlers/main.yml b/roles/server_native-journalctl/handlers/main.yml
similarity index 100%
rename from roles/native-journalctl/handlers/main.yml
rename to roles/server_native-journalctl/handlers/main.yml
diff --git a/roles/native-journalctl/meta/main.yml b/roles/server_native-journalctl/meta/main.yml
similarity index 100%
rename from roles/native-journalctl/meta/main.yml
rename to roles/server_native-journalctl/meta/main.yml
diff --git a/roles/native-journalctl/tasks/main.yml b/roles/server_native-journalctl/tasks/main.yml
similarity index 100%
rename from roles/native-journalctl/tasks/main.yml
rename to roles/server_native-journalctl/tasks/main.yml
diff --git a/roles/native-journalctl/templates/journald.conf.j2 b/roles/server_native-journalctl/templates/journald.conf.j2
similarity index 100%
rename from roles/native-journalctl/templates/journald.conf.j2
rename to roles/server_native-journalctl/templates/journald.conf.j2
diff --git a/roles/native-letsencrypt/meta/main.yml b/roles/server_native-letsencrypt/meta/main.yml
similarity index 100%
rename from roles/native-letsencrypt/meta/main.yml
rename to roles/server_native-letsencrypt/meta/main.yml
diff --git a/roles/native-letsencrypt/tasks/main.yml b/roles/server_native-letsencrypt/tasks/main.yml
similarity index 100%
rename from roles/native-letsencrypt/tasks/main.yml
rename to roles/server_native-letsencrypt/tasks/main.yml
diff --git a/roles/native-letsencrypt/templates/letsencrypt.conf.j2 b/roles/server_native-letsencrypt/templates/letsencrypt.conf.j2
similarity index 100%
rename from roles/native-letsencrypt/templates/letsencrypt.conf.j2
rename to roles/server_native-letsencrypt/templates/letsencrypt.conf.j2
diff --git a/roles/native-letsencrypt/templates/ssl_header.j2 b/roles/server_native-letsencrypt/templates/ssl_header.j2
similarity index 100%
rename from roles/native-letsencrypt/templates/ssl_header.j2
rename to roles/server_native-letsencrypt/templates/ssl_header.j2
diff --git a/roles/native-locales/tasks/main.yml b/roles/server_native-locales/tasks/main.yml
similarity index 100%
rename from roles/native-locales/tasks/main.yml
rename to roles/server_native-locales/tasks/main.yml
diff --git a/roles/native-locales/templates/locale.conf b/roles/server_native-locales/templates/locale.conf
similarity index 100%
rename from roles/native-locales/templates/locale.conf
rename to roles/server_native-locales/templates/locale.conf
diff --git a/roles/native-locales/templates/locale.gen b/roles/server_native-locales/templates/locale.gen
similarity index 100%
rename from roles/native-locales/templates/locale.gen
rename to roles/server_native-locales/templates/locale.gen
diff --git a/roles/native-nginx/handlers/main.yml b/roles/server_native-nginx/handlers/main.yml
similarity index 100%
rename from roles/native-nginx/handlers/main.yml
rename to roles/server_native-nginx/handlers/main.yml
diff --git a/roles/native-nginx/readme.md b/roles/server_native-nginx/readme.md
similarity index 100%
rename from roles/native-nginx/readme.md
rename to roles/server_native-nginx/readme.md
diff --git a/roles/native-nginx/tasks/main.yml b/roles/server_native-nginx/tasks/main.yml
similarity index 100%
rename from roles/native-nginx/tasks/main.yml
rename to roles/server_native-nginx/tasks/main.yml
diff --git a/roles/native-nginx/templates/nginx.conf.j2 b/roles/server_native-nginx/templates/nginx.conf.j2
similarity index 100%
rename from roles/native-nginx/templates/nginx.conf.j2
rename to roles/server_native-nginx/templates/nginx.conf.j2
diff --git a/roles/native-pacman-update/tasks/main.yml b/roles/server_native-pacman-update/tasks/main.yml
similarity index 100%
rename from roles/native-pacman-update/tasks/main.yml
rename to roles/server_native-pacman-update/tasks/main.yml
diff --git a/roles/native-postfix/meta/main.yml b/roles/server_native-postfix/meta/main.yml
similarity index 100%
rename from roles/native-postfix/meta/main.yml
rename to roles/server_native-postfix/meta/main.yml
diff --git a/roles/native-postfix/tasks/main.yml b/roles/server_native-postfix/tasks/main.yml
similarity index 100%
rename from roles/native-postfix/tasks/main.yml
rename to roles/server_native-postfix/tasks/main.yml
diff --git a/roles/native-postfix/templates/aliases.j2 b/roles/server_native-postfix/templates/aliases.j2
similarity index 100%
rename from roles/native-postfix/templates/aliases.j2
rename to roles/server_native-postfix/templates/aliases.j2
diff --git a/roles/native-postfix/templates/main.cf.j2 b/roles/server_native-postfix/templates/main.cf.j2
similarity index 100%
rename from roles/native-postfix/templates/main.cf.j2
rename to roles/server_native-postfix/templates/main.cf.j2
diff --git a/roles/native-primary-backup/README.md b/roles/server_native-primary-backup/README.md
similarity index 100%
rename from roles/native-primary-backup/README.md
rename to roles/server_native-primary-backup/README.md
diff --git a/roles/native-primary-backup/meta/main.yml b/roles/server_native-primary-backup/meta/main.yml
similarity index 100%
rename from roles/native-primary-backup/meta/main.yml
rename to roles/server_native-primary-backup/meta/main.yml
diff --git a/roles/native-pull-primary-backups/README.md b/roles/server_native-pull-primary-backups/README.md
similarity index 100%
rename from roles/native-pull-primary-backups/README.md
rename to roles/server_native-pull-primary-backups/README.md
diff --git a/roles/native-pull-primary-backups/files/pull-remote-backup.sh b/roles/server_native-pull-primary-backups/files/pull-remote-backup.sh
similarity index 100%
rename from roles/native-pull-primary-backups/files/pull-remote-backup.sh
rename to roles/server_native-pull-primary-backups/files/pull-remote-backup.sh
diff --git a/roles/native-pull-primary-backups/handlers/main.yml b/roles/server_native-pull-primary-backups/handlers/main.yml
similarity index 100%
rename from roles/native-pull-primary-backups/handlers/main.yml
rename to roles/server_native-pull-primary-backups/handlers/main.yml
diff --git a/roles/native-pull-primary-backups/meta/main.yml b/roles/server_native-pull-primary-backups/meta/main.yml
similarity index 100%
rename from roles/native-pull-primary-backups/meta/main.yml
rename to roles/server_native-pull-primary-backups/meta/main.yml
diff --git a/roles/native-pull-primary-backups/tasks/main.yml b/roles/server_native-pull-primary-backups/tasks/main.yml
similarity index 100%
rename from roles/native-pull-primary-backups/tasks/main.yml
rename to roles/server_native-pull-primary-backups/tasks/main.yml
diff --git a/roles/native-pull-primary-backups/templates/pull-remote-backups.service.j2 b/roles/server_native-pull-primary-backups/templates/pull-remote-backups.service.j2
similarity index 100%
rename from roles/native-pull-primary-backups/templates/pull-remote-backups.service.j2
rename to roles/server_native-pull-primary-backups/templates/pull-remote-backups.service.j2
diff --git a/roles/native-pull-primary-backups/templates/pull-remote-backups.sh.j2 b/roles/server_native-pull-primary-backups/templates/pull-remote-backups.sh.j2
similarity index 100%
rename from roles/native-pull-primary-backups/templates/pull-remote-backups.sh.j2
rename to roles/server_native-pull-primary-backups/templates/pull-remote-backups.sh.j2
diff --git a/roles/native-pull-primary-backups/templates/pull-remote-backups.timer.j2 b/roles/server_native-pull-primary-backups/templates/pull-remote-backups.timer.j2
similarity index 100%
rename from roles/native-pull-primary-backups/templates/pull-remote-backups.timer.j2
rename to roles/server_native-pull-primary-backups/templates/pull-remote-backups.timer.j2
diff --git a/roles/native-pull-primary-backups/vars/main.yml b/roles/server_native-pull-primary-backups/vars/main.yml
similarity index 100%
rename from roles/native-pull-primary-backups/vars/main.yml
rename to roles/server_native-pull-primary-backups/vars/main.yml
diff --git a/roles/native-python-pip/tasks/main.yml b/roles/server_native-python-pip/tasks/main.yml
similarity index 100%
rename from roles/native-python-pip/tasks/main.yml
rename to roles/server_native-python-pip/tasks/main.yml
diff --git a/roles/native-sshd/handlers/main.yml b/roles/server_native-sshd/handlers/main.yml
similarity index 100%
rename from roles/native-sshd/handlers/main.yml
rename to roles/server_native-sshd/handlers/main.yml
diff --git a/roles/native-sshd/meta/main.yml b/roles/server_native-sshd/meta/main.yml
similarity index 100%
rename from roles/native-sshd/meta/main.yml
rename to roles/server_native-sshd/meta/main.yml
diff --git a/roles/native-sshd/readme.md b/roles/server_native-sshd/readme.md
similarity index 100%
rename from roles/native-sshd/readme.md
rename to roles/server_native-sshd/readme.md
diff --git a/roles/native-sshd/tasks/main.yml b/roles/server_native-sshd/tasks/main.yml
similarity index 100%
rename from roles/native-sshd/tasks/main.yml
rename to roles/server_native-sshd/tasks/main.yml
diff --git a/roles/native-sshd/templates/sshd_config.j2 b/roles/server_native-sshd/templates/sshd_config.j2
similarity index 100%
rename from roles/native-sshd/templates/sshd_config.j2
rename to roles/server_native-sshd/templates/sshd_config.j2
diff --git a/roles/native-sudo/files/sudoers b/roles/server_native-sudo/files/sudoers
similarity index 100%
rename from roles/native-sudo/files/sudoers
rename to roles/server_native-sudo/files/sudoers
diff --git a/roles/native-sudo/tasks/main.yml b/roles/server_native-sudo/tasks/main.yml
similarity index 100%
rename from roles/native-sudo/tasks/main.yml
rename to roles/server_native-sudo/tasks/main.yml
diff --git a/roles/native-systemd-email/handlers/main.yml b/roles/server_native-systemd-email/handlers/main.yml
similarity index 100%
rename from roles/native-systemd-email/handlers/main.yml
rename to roles/server_native-systemd-email/handlers/main.yml
diff --git a/roles/native-systemd-email/readme.md b/roles/server_native-systemd-email/readme.md
similarity index 100%
rename from roles/native-systemd-email/readme.md
rename to roles/server_native-systemd-email/readme.md
diff --git a/roles/native-systemd-email/tasks/main.yml b/roles/server_native-systemd-email/tasks/main.yml
similarity index 100%
rename from roles/native-systemd-email/tasks/main.yml
rename to roles/server_native-systemd-email/tasks/main.yml
diff --git a/roles/native-systemd-email/templates/msmtprc.conf.j2 b/roles/server_native-systemd-email/templates/msmtprc.conf.j2
similarity index 100%
rename from roles/native-systemd-email/templates/msmtprc.conf.j2
rename to roles/server_native-systemd-email/templates/msmtprc.conf.j2
diff --git a/roles/native-systemd-email/templates/systemd-email.sh.j2 b/roles/server_native-systemd-email/templates/systemd-email.sh.j2
similarity index 100%
rename from roles/native-systemd-email/templates/systemd-email.sh.j2
rename to roles/server_native-systemd-email/templates/systemd-email.sh.j2
diff --git a/roles/native-systemd-email/templates/systemd-email@.service.j2 b/roles/server_native-systemd-email/templates/systemd-email@.service.j2
similarity index 100%
rename from roles/native-systemd-email/templates/systemd-email@.service.j2
rename to roles/server_native-systemd-email/templates/systemd-email@.service.j2
diff --git a/roles/native-systemd-email/vars/main.yml b/roles/server_native-systemd-email/vars/main.yml
similarity index 100%
rename from roles/native-systemd-email/vars/main.yml
rename to roles/server_native-systemd-email/vars/main.yml
diff --git a/roles/native-user-administrator/Readme.md b/roles/server_native-user-administrator/Readme.md
similarity index 100%
rename from roles/native-user-administrator/Readme.md
rename to roles/server_native-user-administrator/Readme.md
diff --git a/roles/native-user-administrator/files/administrator b/roles/server_native-user-administrator/files/administrator
similarity index 100%
rename from roles/native-user-administrator/files/administrator
rename to roles/server_native-user-administrator/files/administrator
diff --git a/roles/native-user-administrator/meta/main.yml b/roles/server_native-user-administrator/meta/main.yml
similarity index 100%
rename from roles/native-user-administrator/meta/main.yml
rename to roles/server_native-user-administrator/meta/main.yml
diff --git a/roles/native-user-administrator/tasks/main.yml b/roles/server_native-user-administrator/tasks/main.yml
similarity index 100%
rename from roles/native-user-administrator/tasks/main.yml
rename to roles/server_native-user-administrator/tasks/main.yml
diff --git a/roles/native-user-alarm/tasks/main.yml b/roles/server_native-user-alarm/tasks/main.yml
similarity index 100%
rename from roles/native-user-alarm/tasks/main.yml
rename to roles/server_native-user-alarm/tasks/main.yml
diff --git a/roles/native-user-backup/files/backup b/roles/server_native-user-backup/files/backup
similarity index 100%
rename from roles/native-user-backup/files/backup
rename to roles/server_native-user-backup/files/backup
diff --git a/roles/native-user-backup/meta/main.yml b/roles/server_native-user-backup/meta/main.yml
similarity index 100%
rename from roles/native-user-backup/meta/main.yml
rename to roles/server_native-user-backup/meta/main.yml
diff --git a/roles/native-user-backup/readme.md b/roles/server_native-user-backup/readme.md
similarity index 100%
rename from roles/native-user-backup/readme.md
rename to roles/server_native-user-backup/readme.md
diff --git a/roles/native-user-backup/tasks/main.yml b/roles/server_native-user-backup/tasks/main.yml
similarity index 100%
rename from roles/native-user-backup/tasks/main.yml
rename to roles/server_native-user-backup/tasks/main.yml
diff --git a/roles/native-user-backup/templates/authorized_keys.j2 b/roles/server_native-user-backup/templates/authorized_keys.j2
similarity index 100%
rename from roles/native-user-backup/templates/authorized_keys.j2
rename to roles/server_native-user-backup/templates/authorized_keys.j2
diff --git a/roles/native-user-backup/templates/ssh-wrapper.sh.j2 b/roles/server_native-user-backup/templates/ssh-wrapper.sh.j2
similarity index 100%
rename from roles/native-user-backup/templates/ssh-wrapper.sh.j2
rename to roles/server_native-user-backup/templates/ssh-wrapper.sh.j2
diff --git a/roles/native-user-backup/vars/main.yml b/roles/server_native-user-backup/vars/main.yml
similarity index 100%
rename from roles/native-user-backup/vars/main.yml
rename to roles/server_native-user-backup/vars/main.yml
diff --git a/roles/native-wireguard-behind-firewall/meta/main.yml b/roles/server_native-wireguard-behind-firewall/meta/main.yml
similarity index 100%
rename from roles/native-wireguard-behind-firewall/meta/main.yml
rename to roles/server_native-wireguard-behind-firewall/meta/main.yml
diff --git a/roles/native-wireguard-behind-firewall/readme.md b/roles/server_native-wireguard-behind-firewall/readme.md
similarity index 100%
rename from roles/native-wireguard-behind-firewall/readme.md
rename to roles/server_native-wireguard-behind-firewall/readme.md
diff --git a/roles/native-wireguard-behind-firewall/tasks/main.yml b/roles/server_native-wireguard-behind-firewall/tasks/main.yml
similarity index 100%
rename from roles/native-wireguard-behind-firewall/tasks/main.yml
rename to roles/server_native-wireguard-behind-firewall/tasks/main.yml
diff --git a/roles/native-wireguard/README.md b/roles/server_native-wireguard/README.md
similarity index 100%
rename from roles/native-wireguard/README.md
rename to roles/server_native-wireguard/README.md
diff --git a/roles/native-wireguard/handlers/main.yml b/roles/server_native-wireguard/handlers/main.yml
similarity index 100%
rename from roles/native-wireguard/handlers/main.yml
rename to roles/server_native-wireguard/handlers/main.yml
diff --git a/roles/native-wireguard/tasks/main.yml b/roles/server_native-wireguard/tasks/main.yml
similarity index 100%
rename from roles/native-wireguard/tasks/main.yml
rename to roles/server_native-wireguard/tasks/main.yml
diff --git a/roles/system-security/meta/main.yml b/roles/server_system-security/meta/main.yml
similarity index 100%
rename from roles/system-security/meta/main.yml
rename to roles/server_system-security/meta/main.yml
diff --git a/roles/system-update/meta/main.yml b/roles/server_system-update/meta/main.yml
similarity index 100%
rename from roles/system-update/meta/main.yml
rename to roles/server_system-update/meta/main.yml