reorganized project folders to separate test using classes