fixed classpath issues. fixed class names after restructuring SDK.