rearranged layout for maven