fixes layout of  add address and reorganizing java files