Maven clean-up and Version 2.0 POM files
ReSharper tidying
Version 2.0 POMs