refactored files and directories
updated setup.py