Cleaned directories, changed cmakes for makefiles, updated readme