restructure in preparation for more files