Modify previous wrong directory structure, redundant files