reorganize for newer version of middleman