cleaned up file organization