Ongoing refactoring of a simple website