Replaced everything with 'newmodule' template