BaseMaze moved, fixed namespaces