Classes are now in the datastore

Right hand side and left hand side on the wrong side :(