Changed all classes to "new style" classes