Moved more classes into lightctl.h