Fixed file structure issues.