Plot file and msic folders added
Merged fixed, I think
Another merge