Reworked the modules to a more object oriented layout
A lot of work done on Orr, layout/design is slowing getting into place.