Less partials for easier organisation

My makes PR is getting too long so I cherry-picked this out. This should help us stay organized as we build out Profile.