Better spec organization