Fixed file structure again.