A more natural file hierarchy