Major directory and file names rework