Hi Thilina, I prefer that you fix bugs in your previous refactoring before starting a new sub-project (you have started work on server_privileges.php)
Please compile a list of these bugs, open artefacts on our bug tracker and reply here references to these bugs, in one post. I will then verify to ensure we did not miss anything.