FWK-52 : Remove libs from framework, move files back to root