Restructuring file structue.  Corrected POM artifact names