Changed CMakeLists to solve dependency order inclusion