move libs back to main package