Improvement : Rearrange directories.