Restructure to better align files and improve event choosing