Folder and file restructuring
Fixed typo