Align spec folder hierarchy with lib folder hierarchy
Merge branch 'master' into allow-colon-method-call-for-constructor