cleaned up hierarchy a lot