Project source structure modified
Preparing for cmake