Split project, using this as a library now to allow more clients