diff --git a/.travis.yml b/.travis.yml
index 5c6ba09b29c..ed64b06f64f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -114,7 +114,7 @@ install:
   - pip install git+https://github.com/ansible/ansible.git@devel#egg=ansible
   - pip install git+https://github.com/sivel/ansible-testing.git#egg=ansible_testing
 script:
-  - python2.4 -m compileall -fq -x 'cloud/|monitoring/zabbix.*\.py|/dnf\.py|/layman\.py|/maven_artifact\.py|clustering/(consul.*|znode)\.py|notification/pushbullet\.py|database/influxdb/influxdb.*\.py|database/mssql/mssql_db\.py|/letsencrypt\.py|network/f5/bigip.*\.py|remote_management/ipmi/.*\.py|system/atomic_.*\.py' .
+  - python2.4 -m compileall -fq -x 'cloud/|monitoring/zabbix.*\.py|/dnf\.py|/layman\.py|/maven_artifact\.py|clustering/(consul.*|znode)\.py|notification/pushbullet\.py|database/influxdb/influxdb.*\.py|database/mssql/mssql_db\.py|/letsencrypt\.py|network/f5/bigip.*\.py|remote_management/ipmi/.*\.py|cloud/atomic/atomic_.*\.py' .
   - python2.6 -m compileall -fq .
   - python2.7 -m compileall -fq .
   - python3.4 -m compileall -fq . -x $(echo "$PY3_EXCLUDE_LIST"| tr ' ' '|')
diff --git a/cloud/atomic/__init__.py b/cloud/atomic/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/system/atomic_host.py b/cloud/atomic/atomic_host.py
similarity index 100%
rename from system/atomic_host.py
rename to cloud/atomic/atomic_host.py
diff --git a/system/atomic_image.py b/cloud/atomic/atomic_image.py
similarity index 100%
rename from system/atomic_image.py
rename to cloud/atomic/atomic_image.py