ticket: 5 project reorganized