Added missing dependencies for codeclib and pluginlib. This required renaming some...