Refactor class locations