More restructuring
More fixes