Fix spec folders structure
Bump to 2.1.2