Fix issue on mappings
Reorganization of project layout. Update of DataSources