Cleaned up project structure and references.