moved around packages to abstract desktop classes
  from Android source path