Commit folder structure cleanup