Refactor: move files around