Restructured folder layout and updated files to correspond with new folder structure