create packages and move classes into the appropriate packages