Refractor project for 1.6