Reorganizing files
update formatting
fixes #33, _escaped_fragment_ rewrite rule was already working