fixing module and package naming