minor improvements, moved packages, javadocs

Change-Id: Idc761fed3613fa53f941ab03bfd9f2083e0fc3a1