Enhance files requiring code

[ranss]

I have made some few changes to remove "superfluous" code while requiring necessary files in the plugin.