Refactor and create many more OSGi modules. Modules have not been tested
or deployed, but everything compiles