Merge "Move source code to src subdir"