Refactored packages to be a better structure.