restructure and add map
Merge pull request #1 from ustroetz/master

restructure and add map