Rearrange import logic.
Rearrange import logic.

This groups related code together.  It also avoids duplication.

razvanvasile/Work-Mini-Projects,razvanvasile/Work-Mini-Projects,razvanvasile/Work-Mini-Projects