Added jackson lib and changed layout