Repo reorg.
committing for further testing, need to eliminate memory leaks.