[#1027] [Shweta] renamed package | removed unwanted code