reorganize function/file locations