Reworked module imports