Reposition some folders and submit