Moved around files. Organization...
Updated demo project file references.