Refactored and structure updated. Module of map prepared.