Updated folder structure

Updated the folder structure and added a new test