ADDED: dbunit bundle
UPDATED: structure cleanup