reorganize + general improvements