Split more code on modules