Fixing up namespace and folder structure for Composer tests.