Uncoupled creatures and items, and much refactor