Organize classes into different packaging hierarchy and update any class
references