Directory/file layout re-organization