diff --git a/client/ipa-client-automount.in b/ipaclient/install/ipa_client_automount.py
similarity index 100%
rename from client/ipa-client-automount.in
rename to ipaclient/install/ipa_client_automount.py
diff --git a/install/tools/ipactl.in b/ipaserver/install/ipactl.py
similarity index 100%
rename from install/tools/ipactl.in
rename to ipaserver/install/ipactl.py