Begin restructuring/reworking. Working in master since nobody else cares