Moved specs to more traditional directory structure