Remove old folders and rename to new folder structure