Let's try to keep everything under one roof

Change-Id: Ie38741b22b5799eec889e7eb1d8b48ed90cfbc1e