code format
1.6 java fixes
fix project structure
refactor persistence module