Move QGIS plugin file to their own directory and correct PEP8 errors