rename, reorder, reorganize and refactory all around the ABCs
normalize examples a bit