State Code Cleanup Part II

Organized more code into their respective folders.