Reorganize specs
Automate const removal in specs