Refactored spec files into more appropriate directories
Moved files to more appropriate directories
Changed 'require' references