Reorganized into static lib