Refactoring package names for sections 8,9,10 and 11