I never bring steel battle axes - I use a wood furnace and some copper bars and smelt some copper axes instead. Thank you, deconstructable wagons.
I class my dwarves by usefulness.
Class S - Champions, Nobles, Children, anyone who can't work. Treated as demands go, although champions may get a kicked out tomb or a nice artifact if I have one.
Class A - Miners, Woodcutters, Carpenters, Masons, Growers, Brewers. Any jobs necessary for survival go here. These dwarves get the best treatment available. 5x5 bedrooms, offices, everything engraved, closest to food / drink, personal mausoleums.
Class B - Record Keepers, Engravers, Animal Trainers, Armorsmiths, Furnace Operators, Metalsmiths, Weaponsmiths, Stone / Wood / Bone Crafters, Butchers, Mechanics, Building Designers / Architects. Very useful jobs go here. They get normal (my normal is another player's "pretty good") treatment if possible. 4x4 bedrooms, small office (except Record Keeper, he gets a pimped out one), smoothed and eventually engraved, small personal tombs.
Class C - Bowyers, Animal Trainers, Gem Cutters, Leatherworkers, Wood Burners. Useful jobs go here. They get "meh" treatment, and I get around to them later than the Class As and Bs. 3x3 bedrooms, smoothed and a high-quality shared graveyard.
Class D - Pretty much every other non-military, non-trading skill. Given shittiest rooms possible and drafted into the Engraver Corps or sent out with a wooden weapon and no armour as fodder or for hunting. Also do pretty much all the hauling. 1x1 or 2x2 beds, thrown out after death and given insulting nicknames. Any Class D who hits legendary in a job gets to become a Class B citizen.