Re-arranged the test directory to prepare for more