Restructured tests folder