Replacing internal rependencies on com.sun.org.apache.* with org.apache.*