Remove the tools module and move annotations into extras