Moving around some stuff and trying to fix JavaDoc creation.