Reorganizing files the way I like.

Signed-off-by: Matt Nunes <matt@mattnunes.com>