core structure and accounting module bugfixing