refactoring package names, upgraded to Play 2.3.1