Modified the structure to have a bunch of sub-packages