ticket: 4 Project reorganized