ticket:1 Fixing project structure