Deleting and putting new ones

Separating them into different classes so they're all easier to keep track of.