Added static server; folder restructure