Makefiles further split. State Machines simplified.