Cleanup repo A - order in files