Repo Reorg

Reorganization of the repository to simplify running from terminal