Using inotools project structure
Merging with inotools structure