move stuff into proper places