Directory structure and old Makefile