Update gitignore
Fix some setup things
Restructured code