Started refactoring the directive
Merged #24
Merge branch 'isakb-fix-issue-23'
Finished moving the CSV login to the service
Tests adjustments and completed refactoring