Cleaned up naming and file structure
Cleaned up sample data and added demo