Minor tweak of file structure