move changes into templated app