New project structure
fixed .gitignore conflicts