Refactoring presentation, object and data layers
Refactoring javagal bundle