updates for backward/foreward compatibility, reorg files
fix to logic of when to throw insert/update/method errors