Renamed and harmonized packages
Removed "cyclic dependency" to parent POM
Merge remote-tracking branch 'upstream/master'