structure changed and plugin edited for new source files