change package name
fix unit tests
fix templates