Wow, that was a bigger bitch than I thought it would be =D. You can check my move log if you have any question about where they wound up, though I kept the namings all as logical as possible. Let me know if I missed anything.