Merge "Moving source class declaration"