Restructed project layout.