Restructuring of project layout, and addition of tests