restructured static files.
fix merge