Cleaned up classes, put stuff in their own files.