More restructuring
minor changes