refactoring start & add test folder