cleaning for new repo structure