restructured android plugin