Re-Commit with folder structure