Move identifiers to a better location
Merge pull request #51 from smarterclayton/move_identifiers

Move identifiers to a better location