project refactoring

project refactoring