Changed folder structure to meet setup.py requirements