modified deps
add missing files
another revamp
add missing files and commit the deletion of others