No. Leave existing stuff as it is – sort it out later when you find such things easy – and add keywords to these images.
New stuff, get it in a simple date based folder structure as described. Do include the date at the start of folder and filenames using a convention like YYYYMMDD. You won’t always be using LR and dates/text help, and this helps sort by shooting date and also helps ensure no originals ever have duplicate filenames. Also do include very broad “shoot” description – eg “Charlottetown”, but don’t waste time including in the file name anything that’s more image-specific like “Charlottetown bicycle”, “Charlottetown seals” etc. Instead put that time into keywords.