Changed source directory structure and updated CMakeLists.txt to reflect the changes.