Unignored .gitignore
Removed redundant code
Changed file structure so setuptools works