Light reorg + added Android OS shares