reorganized spec support files to be more maintainable