rearranging build steps