namespace refactoring
namespace refactoring
include clisk and remove java files