Minor refactor of folders in the solution.
Added a small number of tests to increase coverage