Moving import logic to external folder