Fixing spec to use new dir structure