Grant directory reorganization and cleanup, start of a new make system.