add basic EAP6 style logging plus java imports refactor