Dynamic plot working
Restructuring complete