Clean up and organise resources p1
Clean up and organise resources p2