Move navigation into controls directory