Added some comments
Move classes around