Did some organizing. :)