refactored class location