Added path constraints for phi classes, some ifdef switches, removed old stuff
drwxr-xr-x - ir