Merged all branches, Reorganizing Repository, will remove .gitignore later