removed classes that are now their own files