fixed directory structure and reference issues.