moving android code to droid folder