Finish the refactoring of the module structure and the public files