Hi navjottomer,
I just saw this topic here and briefly looked at the work you've done. Awesome!
However, I have a friendly tip: split things. Don't do everything in one branch, because most probably it wan't all be accepted into dev, and later into master. Don't let few things stop the entire PR.
So, smaller things, like code realignment, refactoring, phpdoc, typos and similar stuff should go to => Osclass dev branch, directly. Also, it makes tracking issues/PRs more easily for everyone.
This way you'll save time and focus on important things in your version.
This is just my opinion, and also, to make it easier for the Osclass Team to review and accept your changes.
And, OT already announced few months earlier they will start removing things for the 4.0 version, but it is not so clear when that will happen, so...
Regards,
dev101