updates refactor project structure