Fix broken build and update dependencies.
Update project structure.