rhbz1139950 - refactor (rename,move classes/methods and add javadoc)