Reconcile lib and spec directory structure