Moving user and client entity decorators into component namespace