Big code reorganization. Feature collection pushed to a service