Refactoring the packages and structure to make things more consistent.