Refactoring source layout; Karma tests!