general cleanup, move dependencies to .depend