rename refactoring and addressing stylecop issues
restructuring codes, namespace refactoring