Adding remainder of static/common directory