Cleaned the project structure and removed menu bar. From now on will be doing proper new-branch commits and then merging after review