reorganised setup system