android update

re ordered folders and formatted xml