Readded folders that were removed, undid change to CMakeLists.txt for now.