fixed the import of java codes due to re organization