reorganizing folders
cMerge https://github.com/shaun117/Spring14-CSC207