Modularized these two dirs