Updating calls to class initializers to use keyword-based argument passing.
Merge pull request #2 from fslavin/reorg

Updating calls to class initializers to use keyword-based argument passing.