diff --git a/action_plugins/ipahost.py b/roles/ipaclient/action_plugins/ipahost.py
similarity index 100%
rename from action_plugins/ipahost.py
rename to roles/ipaclient/action_plugins/ipahost.py
diff --git a/library/ipa_facts.py b/roles/ipaclient/library/ipa_facts.py
similarity index 100%
rename from library/ipa_facts.py
rename to roles/ipaclient/library/ipa_facts.py
diff --git a/library/ipaapi.py b/roles/ipaclient/library/ipaapi.py
similarity index 100%
rename from library/ipaapi.py
rename to roles/ipaclient/library/ipaapi.py
diff --git a/library/ipadiscovery.py b/roles/ipaclient/library/ipadiscovery.py
similarity index 100%
rename from library/ipadiscovery.py
rename to roles/ipaclient/library/ipadiscovery.py
diff --git a/library/ipaextras.py b/roles/ipaclient/library/ipaextras.py
similarity index 100%
rename from library/ipaextras.py
rename to roles/ipaclient/library/ipaextras.py
diff --git a/library/ipafixca.py b/roles/ipaclient/library/ipafixca.py
similarity index 100%
rename from library/ipafixca.py
rename to roles/ipaclient/library/ipafixca.py
diff --git a/library/ipafstore.py b/roles/ipaclient/library/ipafstore.py
similarity index 100%
rename from library/ipafstore.py
rename to roles/ipaclient/library/ipafstore.py
diff --git a/library/ipahost.py b/roles/ipaclient/library/ipahost.py
similarity index 100%
rename from library/ipahost.py
rename to roles/ipaclient/library/ipahost.py
diff --git a/library/ipajoin.py b/roles/ipaclient/library/ipajoin.py
similarity index 100%
rename from library/ipajoin.py
rename to roles/ipaclient/library/ipajoin.py
diff --git a/library/ipanss.py b/roles/ipaclient/library/ipanss.py
similarity index 100%
rename from library/ipanss.py
rename to roles/ipaclient/library/ipanss.py
diff --git a/library/ipasssd.py b/roles/ipaclient/library/ipasssd.py
similarity index 100%
rename from library/ipasssd.py
rename to roles/ipaclient/library/ipasssd.py
diff --git a/library/ipatest.py b/roles/ipaclient/library/ipatest.py
similarity index 100%
rename from library/ipatest.py
rename to roles/ipaclient/library/ipatest.py