Reorganize into basketcase module with index