Move files around, make demo build able.