Organize deps a little