Reorganisation of server components
Introduced personalization component