Repo cleanup and spec refactoring