modified class naming convention and routing