More name changes and module organization stuff