Note: tests folder is still different until we merge PRs and change directory structure here to /src, /tests, etc.