re-structured common libs