File moving and folder restructure