Fix import error and move lists into submodule