made an include folder for headers, also fixed some Makefiles