general commit and some organisation