CHANGED:clean up the code ,remove screen relevant class files to
views/screens package;