Model-View-Control Structure

Also updated colours, and selection areas in shapes.