Added Email component
Reworked package structure