Adding refactoring
Added fixes for static files.