Refactor, fix things
Reorganize