Moved some files into correct maven archetype locations