WIP Refactor: add missing files