Significant refactoring of Class code and project cleanup by removing unused test folder