reverting controllers to default package because I've not found the way
to make them work elsewhere.

finishing package renaming