Change directory structure
Merge branch 'setuptools'
Fix module structure