Maven

Updated as previously discussed