Updated the singleton pattern.
Reorg of the data folder.
Fixed bug when pressing 'cancel' in the loading system windows for mappings shapes.
Data folder reorg.