made files more logical