Getting demo and test files to run
Removed unused files