Changed the controller package stucture