file organization cleanup

Signed-off-by: Jake Bromberg <jake.bromberg@gmail.com>