Adds changes from OSF use.
Updates gitignore
Fixes tests.
Fixes gitignore.
Major reorganization of files.