Modularize control, entity, system