Restructured unit test folders to support the new build system