Rearranged objects into different packages for clarity