Renamed maven modules
Merge remote-tracking branch 'origin/exercise1' into exercise1