Move serc files into /lib
Refactor + tests