Renamed packages to reflect new project structure