prepare for file name cleaning
updated file names; added StateWidget libs