sun: moved things around a bit to match the 'demo' naming and directory structure used in vegas