Fixed project structure!

Also added more .gitignore