Removed wrong init file in src directory.
Merge branch 'master' into kai-branch