re-structured projects and libraries