Refactor

Replaced all instances of drive and folder image references which used a
bare int to use the enum created to identify drive types. More readable.
Yay.

Now we're getting somewhere. Still so much fugly, though.