Add the new project structure to the fe-server branch