Replace fmap with <$>
Add updates for module functions
Update parsers.

Remove redundant data structures.
Update parsers.

Remove redundant data structures.
Remove module comment.
Merge branch 'terminals'
Merge changes for parsers.