Move and rename common headers from under