Clean CMakeLists and package
Big time cleaning ;)