Initial mods
Reorganizing repo and fixing tests