Cleanup Code

Removed Adapters
Add Package Type Configuration