Updated Setup.py and directory
Updated directory structure
Updated directory structure