Move specs to a namespace

More specs are coming
Merge branch 'master' into folders