Reorder things
Big changes