Starting to restructure the utility into an app
Changing the package locations...