new project structure, redesigned entities relations