Added tests, refactored and prepared data structure.