Really the last commit

Last Commit before visual merge - reorganization of the file
directories, removing hard coded property info, etc.