Changed directory structure for future working setup.py