ticket: 8 Project reorganized