Move functions relating to individual sessions to the correct class