Reorganize
Reorganize
Update
Huge changes, be carrefull
Changes before merge
Prepare to merge
Merge
Various changes
Working version with H2 as mock for real DB