Rendering module refactoring