Merge "Moved source to match upstream file structure"