... to reduce number of files in the top-level directory. Change-Id: I44a5b718c2bc88d084674f4745dc9575dd84fc3f