moved .extras commands to appropriate files