Trait Split

Trait split from the application file