directory structure change

Changed directory structure in order to have the correct one for Cmake
files!