Reorganize module for working with future jahia 7