Move Generic...cmake to new folder matching CMake structure