Improve static file handling
Move assets around