Change file structure
Add move_straight