Rename controller package
Use junit instead of testNG