Rearrange some classes
More updates that I forgot about
Update README