refactor project
new structure updated