refactor: move to a proper structure