Reorganize specs for better readability