reorganized composites and controllers