restructure and introduce android