first pass at organizing files