Change structure, add maven