re-organizing the artifact structure to accomodate maven