another cleanup, and module name change
install and clean target