Finally, moved renderer-module back to renderer