Moved things around for demo directory