Rearrange file structure & update UrlConf