Attempt to reorganize repo, demo view controllers in they own folder