rework naming, add project, move references