Project layout fixes