Move tests back into main src folder for flycheck...
Create location table/model