Makefile improvements and directory renaming