Re-organized and renamed packages into a more logical system