updated projects maven structure
improved readability
Merge commit '570feed1af86d1522b57da661ae617b9edf451f5'

Updated solution to include the required maven dependencies