Restored bin/rio stuff
Fixed up paths