Added Axes class and re-arranged