Updated paths and moved templates