Added JUnit and move items into correct packages
Merge commit '6973264439b1da1a3a9dcfabaa57cfd94b948dc7' into changes

* commit '6973264439b1da1a3a9dcfabaa57cfd94b948dc7':
  Removed unneeded connection method.