Adding new features

Cleaned up the file structures. And will be adding GetBatchedClass