Move features inside their own objects