Update file structure, add partials