moving things to proper dirs