plugin rename problem fixed
reduced complexity of file structure
getting better