namespaces would make all of this sooooo much cleaner and easier.  Especially if you wind up having to refactor.  Think about it.