Add new components and refactor some of the previous ones #35

Closed amusameh closed 6 years ago