Some minor improvements

directory rename

rename