Fix project structure and add deps.