Updates with documentation added to the classes
Removed extra classes which are unreferenced