Moved some source files around into much logical locations. This should also resolve a forward reference bug.