Yeah, the idea was to have things cleaned up in different ways, but due to lack of time, we had to just put everythign back into some "box". I'm not satisfied with this outcome either.
