moved some stuff

?