Moved static content code to own library