Cleaner Makefile and folder tree