converting components to new map syntax
Merge pull request #45 from eoneill/master

converting components to new map syntax