upd for maven style source dirs structure
reformat code
reformat code