20140925 - Removed conversion classes and updated POM file