Reorganized code to be clearer. Renamed synchronous name space to compat...

...ibility_synchronous