Updated the folder structure added code to listener