Moved Box, Sector,... into extra file