Moved stuff around and made a static lib project