removed uneeded lib
organize a little better