Modified getScheme and dictionary.java name and its package