Adjust folder structure