clean up deps
more project orga