Rename MakeUpORM to src and fix  namespace in test project