Partial work on splitting into libraries