Move all units to a single .java and remove unnecessary interfaces