fixing folder conventions