Changed demo project layout.