replaced some files with new skeleton