Fix dependencies
Merge file bundle
Create file traits