Add unit tests for major components

Add line2 and line3 properties to "To" entity
Move some files around