Changed the directory structure, updated setup.py for uploading to pip