Fix file location
Fix template package distribution
Fix package distribution
Fix tests