Fix failing spec
Refactor file organization