Moved some things around to follow a more conventional package stack.