Organised imports and centralised the controller