Clean up deps
Added deps again
Added missing files