Files moved for purposes of sanity.

Files no not need to be that deep in the folder structure.  This is
Java, not Inception.