Remove redundant key.
Move partials to the better place.