Minor reorganization of files.

Signed-off-by: Jack Bransfield <jjbii@builtlight.org>