[gavanwoolery]

Agreed - lots of strange source organization in there. At this point I would organize it much better than I had. :)