Fix copyright
Better structure
Add factory for accessing maps