Make directory structure more sane; remove unshared shared examples