Cleaned up folders, better exception management, added to other result pages.