reorganizing dev lib