correct folders and packages for test