New file structure again.