commenting and adding some more classes for splitting files
also tyding up some classes and marked unused classes as deprectaed