refac layout and update maven dependencies