Re-arranged Test Folder Structure