tided up the files and add structre