remodelling: let's use a modular approach
instead of a package bundle