Merge branch 'master' into working
Re-organization and cleanup of project.

Re organized the project folder structure and locations of objects.
Merge branch 'working'