Fixed artifact hierarchy (really, this time)