Now separated into 3 projects app, external and delivery
Rename of packages to make them more descriptive.
Optimised redundant imports