Reorganize files and folders
Remove old folders from git