Starting the re-org

Moving things around, unit tests to follow