wip: change class paths