Refactor specs into dirs
Add missing spec file - placeholder for now
Specs