moved cmake build files back up to the top level as per convention
Modified CMakeList.txt files to follow new structure.