restructure static app & help with test issues