Change repo dir structure and tweaks for Beta 9