Modified structure and created setup.py