unified structure for Jobs, Items & Clients

also, general clean-up