Move files for consistency.
Case fix step 1.
Case fix step 2.