Clean up includes
Make algorithm list able to handle new plugins