Tech Debt: Moved project one level flatter...