Cms website - total refactoring