Move everything back to features