Cleaned up and organized demo project