Reorganized file structure. Renamed solution files. Started on p1b solution.