Renamed a few folders and files to make more sense. Removed typographic hacks for the time being.