organized folders and fixed makefiles