improved file structure of partials