Better organization of populate modules