reverted the previous changes on splitting the modules up as it seems to totally break perfectus