Clean up and reorganize haddocks