Project re-org to generate static library