Moving transport to module instead of package