1diff --git a/src/ansible-cmdb.py b/bin/ansible-cmdb
2similarity index 100%
3rename from src/ansible-cmdb.py
4rename to bin/ansible-cmdb
5diff --git a/setup.py b/setup.py
6index a8db25d..c1670f1 100755
7--- a/setup.py
8+++ b/setup.py
9@@ -42,17 +42,16 @@ setup(
10 package_dir={'': 'src'},
11 packages=find_packages('src'),
12 include_package_data=True,
13- data_files=\
14- get_data_files(
15- 'src/ansiblecmdb/data',
16- strip='src',
17- prefix='lib'
18- ) +
19- [['lib/ansiblecmdb/', ['src/ansible-cmdb.py']]],
20+ data_files=get_data_files(
21+ 'src/ansiblecmdb/data',
22+ strip='src',
23+ prefix='lib',
24+ ),
25 zip_safe=False,
26- install_requires=['mako', 'pyyaml', 'ushlex', 'jsonxs'],
27+ install_requires=['mako', 'pyyaml'],
28+ extras_require={'jsonxs_templates': ['jsonxs']},
29 scripts=[
30- 'src/ansible-cmdb',
31+ 'bin/ansible-cmdb',
32 ],
33
34 classifiers=[
35diff --git a/src/ansiblecmdb/data/VERSION b/src/ansiblecmdb/data/VERSION
36index 79d94e6..14d2ff6 100644
37--- a/src/ansiblecmdb/data/VERSION
38+++ b/src/ansiblecmdb/data/VERSION
39@@ -1 +1 @@
40-MASTER
41+@version@