Reorganize class locations