Rename class.
Remove dependencies from src files to demo files by moving all the
relevant files in the demo folder to src