Cleaned up the way that partials are handled to be more organized.