LPS-32349 Retrieve the bundles in a better way and reorder some methods in the module framework implementation