Update and rename StringUtils.java to StringUtilsBase.java