folder cleanup, updated Makefile