Modified structure of the directory, added build directory for cmake