Rearranged directory structure and made a new OrbDemo app