Minor Tweaks

Updated directory names, added header to charClass