Session and Activity modules refactorization