Base system reorganization