Rearranged maven layou; Added support for apache1, apache2, and hdp2