renamed some files and added latest sql as required