Consolidate everything into one file instead of arbitrary separation.
Move credential defvars into appropriately named file
Remove errant paren
Update readme