Added adapters, fixed some package structures