Move dataset again
Move to CMake instead of make