Refactored naming, improved structure and adding text-decoration
Added files
More unit tests