rename controller classes to end confusion with model classes
remove models package name prefixes in controllers