Project layout cleanup