file structure refactor for static servers compatibility