Added demo/ back and removed apps/*