Refactored everything into a more logical package structure. Sometimes nested is better than flat.