move stuff where they belong