mv files around to proper dirs