Updated templates + path changes