Changed directory structure and added CMake support