Reorganized source folder.
Merge branch 'master' of https://github.com/davemess/COSC686-Semester-Project