ticket: 1 Project strucrture reorganized