Splitting library into two files