New folder structure. Updated code.