Modules updated, CMakeLists updated, test main added