Changed internal demo project layout a bit.