cleaning up some files, bust some stuff out into includes