removed unused files and added extra class to popupWrapper