Reorganizing, Makefile and clean directories.
Updating submodules