Spliting lib into 2 files