File structure changes

adding some plugins, removing others.