Refactor libs for the last time...