fix movement solver, add wallmask loading . . .

and restructure components