Change structure to compile as static lib