Moving logic where some auto generated files happen