Refactored and cleaned up packages
85 files changed