Moved files back to functions.php

This was meant to clean up the functions file, but I don't believe it was messy to begin with.

Signed-off-by: Bryan Hoffman <bryan@spigotdesign.com>