Changed demo project structure.