renamed package and structure