Plugged in new source code structure