Segregate classes into appropriate packages