Cleaned up some warningws
Demo files now live in their own box