Refactoring file structure so we can prepare tests