Files are now stored in the proper folder.
Non terminals no longer include trailing space(s)