Organized some classes