Updates header and better folder structure