Working Commit, with directory cleanup