move some orphaned files back to common package and server