Sorted classes. Package name changes. Removed old code