changes in Naming and Package