Update project structure
in progress