Lots of changes: Removed all file for phi-opt. Generic approach is now