Refactor, restructure, add work