Fix wrong dependencies between modules in order to be able to load demo data and install from scratch.