Rearranged maps for better flow
Merge pull request #4 from firstvirus92/fix-eu2

Rearranged maps for better flow