Fixes, directory rearangement, broke example.