- Separate out types and methods into appropriate module - Add util folder for small utils used in multiple independent places - Update paths