starting to separate libs