restucturing

setup notes

minor bugs in the plugin Discovery
restructuring

minor bugs setup nots