Updating code, renamed classes and also updated code comments a general cleanup.