More reorganization and a broken Makefile