Adapt to new directory structure
Divide fixtures and adapters