Update project structure and map WIP