Refactor: import modules