Refactored directories tree and CMake files