for first I wanted to keep old things to let the other developers review what is done.

If all cool, I'll remove the old code fully and do the clean up.