Refactoring and added test project
bin & obj deleted