- Refactored the cmake files to match more the common style
- Merged 'include', 'src' and 'test' directories (it is better to have all files in one place)