wrapping up core encounter methods and tidying up root folder