Use no .as so template isn't run
Fix package paths