Redo our directory structure
Move cmake modules to subdirectory