Corrected plugin structure and filenames