Moving to a new naming scheme for files
Well we don't error anymore with the new setup, still bugs to work out