Updated the folder structure to aid with organization