Re-organize all the things!