Clear up load paths and spec layout
WIP on rewriting specs to use newer syntax