Restructured project
Merged .gitignore