Directory structure + font selection mechanism improvement