changes in static folder

merge static and static1, and delete static1