Setup.py fixes
Revert "Setup.py fixes"

This reverts commit f141f418d9810db79ea67e33a3d7a1715f365c74.
Added sub-modules and templates