pre merge update
Removed inner class declaration from package controller as it was choking in final war target environment