Added 'demos' and 'os' subdirectories