Renaming package
Finishing package rename
Renaming core to controller