added classes to appropriate packages