Cleanup
Make sure generated modules put templates in the right place