moved files
moved files and add more script logic