Reordered files

Reordered so that appear in same order as in cluster diagram to help in
presentation.