Removed junk and restructured stuff to be a little bit nicer.