reorganizes file structure, and adds plugin components