Added demo and rename files