Refactored class locations