Update dependencies. Clean up source structure.