Organization

Updated locations and names of some files for readability, maintenance and clarity as we had talked about in meeting.

Isaac