Move CSS and JS files into static folder
Merge fix