Merge "Add more useful source files"