Clean up merge
Move some API packages
Fix APIGeneral
Fix APINetwork
Transformers now delegate to the correct side