cleaned up, put classes in packages