maven structure
updated file references to maven structure
converted maps to new format