Reorganization
Backward compatible API - maybe this time it will work