Internal reorganisation, alpine fixes