Initial commit
Fix conflict
Remove lang directory