Refactor deck list importing