All in one

Moved files into one folder for easy commit and checking out