Created packages and placed the right classes in them. Also deleted some
classes that were not used.