Attempting to clean up the code a bit

Better spacing, Range is a class now, moved some stuff out of the Wiki namespace, etc.