Moved a few things around

Moved States into their own folder for better organizatio