bin folder refactoring
bin folder refactoring
bin folder refactoring
resolving of a conflict