Creating Interfaces and Model classes for all bundles
Tidying up the whole structure