Final packages/classes renaming