started migration to new specs
Fixed last issues with new spec structure
Changed back to just using dev data in @Development