post agile2013, refactored package structure, fixed persistence