Renaming folders, fixing makefile.