Move files to 3rd subfolder + fix definition