Changing the way main classes are declared and instantiated.