comment/filename/structure adjusted, payment entities added