Changed file structure again.