add and remove files, fix dependecies