Cleaned directory architecture and added .gitignore