Some comments
Move context classes into own directory