House keeping, changed project structure