Fixing Maven structure