Package structure refined. Modules renamed