Renamed the packages to follow naming conventions