Reorganize plugin folders (Put them into catagories)

This commit will make cleaning up the plugin code easier