ticket: 1 Project reorganized