Moved some stuff around and removed demo