PR suggestions - restructuring