Moved some stuff around

Signed-off-by: Ryan Hatfield <ryan.hatfield@onsharp.com>