Make project structure consistent with other projects.