Refactoring of the resource bundle controller
Yet more bugfixes for refactoring process