Converted to a library, removed tests for now